turnip

~twom/turnip:master

  1. Git
  2. lp:~twom/turnip
  3. master
Last commit made on 2018-07-03
Get this branch:
git clone -b master https://git.launchpad.net/~twom/turnip
Only Tom Wardill can upload to this branch. If you are Tom Wardill please log in for upload directions.

Branch merges

Branch information

Name:
master
Repository:
lp:~twom/turnip

Recent commits

a183f88... by Colin Watson

Upgrade to lazr.sshserver 0.1.8

Merged from https://code.launchpad.net/~cjwatson/turnip/+git/turnip/+merge/348843

83bb9e6... by Colin Watson

Upgrade to lazr.sshserver 0.1.8

LP: #907675

305b2f9... by Colin Watson

Upgrade to Twisted 17.9.0

Merged from https://code.launchpad.net/~cjwatson/turnip/+git/turnip/+merge/342780

3e46aa0... by Colin Watson

Upgrade to Twisted 17.9.0

9cf5ffa... by Colin Watson

Upgrade to Twisted 16.5.0

cryptography requires libssl-dev as a system dependency, as well as pip
and setuptools upgrades to parse a new environment marker. The
twisted.web.http.Request changes in 16.3.0 require a small change to
HTTPPackClientProtocol.connectionLost, since trying to call
unregisterProducer on a finished request now crashes.

Merged from https://code.launchpad.net/~cjwatson/turnip/+git/turnip/+merge/339505

4c7e0d4... by Colin Watson

Upgrade to lazr.sshserver 0.1.7

0.1.5 fixes a compatibility bug with Twisted >= 16.0.0, 0.1.6 fixes a
long-standing exception-handling bug when loading user-supplied public
keys, and 0.1.7 fixes a regression in 0.1.5.

LP: #830679

cfdc786... by Colin Watson

Upgrade to Twisted 16.5.0

cryptography requires libssl-dev as a system dependency, as well as pip
and setuptools upgrades to parse a new environment marker. The
twisted.web.http.Request changes in 16.3.0 require a small change to
HTTPPackClientProtocol.connectionLost, since trying to call
unregisterProducer on a finished request now crashes.

b5e0bd3... by Colin Watson

Fix compare-merge crash on modify/delete conflicts

We have to go to some work to synthesise semi-reasonable conflict diffs.
I'm not sure they're quite perfect, but they're close enough to give the
user a hint as to what's going on.

LP: #1609972

Merged from https://code.launchpad.net/~cjwatson/turnip/+git/turnip/+merge/331347

52a87a1... by Colin Watson

Fix compare-merge crash on modify/delete conflicts

We have to go to some work to synthesise semi-reasonable conflict diffs.
I'm not sure they're quite perfect, but they're close enough to give the
user a hint as to what's going on.

LP: #1609972

32f54a7... by Colin Watson

Detect renames when generating diffs

LP: #1712754

Merged from https://code.launchpad.net/~cjwatson/turnip/+git/turnip/+merge/330036