Page MenuHomePhabricator

martinvonz (Martin von Zweigbergk)
User

Projects

User Details

User Since
Jun 28 2017, 5:28 PM (186 w, 16 h)

Recent Activity

Yesterday

martinvonz closed D9835: resolve: also detect new :mergediff conflict markers.
Wed, Jan 20, 3:25 PM
martinvonz closed D9832: simplemerge: delete unused find_unconflicted().
Wed, Jan 20, 3:24 PM
martinvonz committed rHG0c95b59a89f1: resolve: also detect new :mergediff conflict markers.
resolve: also detect new :mergediff conflict markers
Wed, Jan 20, 3:24 PM
martinvonz committed rHG98e3a693061a: simplemerge: delete unused find_unconflicted().
simplemerge: delete unused find_unconflicted()
Wed, Jan 20, 3:24 PM

Tue, Jan 19

martinvonz updated the diff for D9835: resolve: also detect new :mergediff conflict markers.
Tue, Jan 19, 6:57 PM
martinvonz added inline comments to D9835: resolve: also detect new :mergediff conflict markers.
Tue, Jan 19, 6:50 PM
martinvonz created D9835: resolve: also detect new :mergediff conflict markers.
Tue, Jan 19, 6:19 PM
martinvonz added a comment to D9832: simplemerge: delete unused find_unconflicted().

Was its purpose to be used in the tests? (It probably should have been put there in that case, but maybe importing mdiff there is more complicated?)

I'm not sure I follow. Do you mean that the test conditions that I removed in this patch might be worth keeping the function for? I had assumed that the function existed because it was used somewhere in Bazaar, but I didn't check if it actually was.

I'm not sure what the test conditions were trying to assert, TBH. I just meant that presumably they were doing something, like asserting the state of the already-performed merge?

Tue, Jan 19, 12:13 PM
martinvonz added a comment to D9832: simplemerge: delete unused find_unconflicted().

Was its purpose to be used in the tests? (It probably should have been put there in that case, but maybe importing mdiff there is more complicated?)

Tue, Jan 19, 11:49 AM
martinvonz created D9832: simplemerge: delete unused find_unconflicted().
Tue, Jan 19, 1:36 AM

Sun, Jan 17

martinvonz committed rHG82edad33fd81: shelve: move listshelves() to new ShelfDir class, so caller need not pass vfs.
shelve: move listshelves() to new ShelfDir class, so caller need not pass vfs
Sun, Jan 17, 2:21 AM
martinvonz committed rHGeec8899407f4: shelve: also create class representing whole directory of shelves.
shelve: also create class representing whole directory of shelves
Sun, Jan 17, 2:21 AM
martinvonz committed rHGf8c5e6ecd008: shelve: add a method for deleting shelf to new shelf class.
shelve: add a method for deleting shelf to new shelf class
Sun, Jan 17, 2:21 AM
martinvonz committed rHG9cdef4c41c94: shelve: use listshelves() in cleanupoldbackups().
shelve: use listshelves() in cleanupoldbackups()
Sun, Jan 17, 2:21 AM
martinvonz committed rHGd3b226b6c8c6: shelve: inline ".patch" constant now that it's only used in the Shelf class.
shelve: inline ".patch" constant now that it's only used in the Shelf class
Sun, Jan 17, 2:21 AM
martinvonz committed rHGe2713c68b477: shelve: replace repo instance in Shelf class by vfs instance.
shelve: replace repo instance in Shelf class by vfs instance
Sun, Jan 17, 2:21 AM
martinvonz committed rHG3204a35e5c7e: shelve: make listshelves() list shelves in a given vfs.
shelve: make listshelves() list shelves in a given vfs
Sun, Jan 17, 2:21 AM
martinvonz committed rHGe33266b916be: shelve: use listdir() instead of readdir() when we don't need stat information.
shelve: use listdir() instead of readdir() when we don't need stat information
Sun, Jan 17, 2:21 AM
martinvonz committed rHGc062874a35db: shelve: don't crash on file with unexpected extension in .hg/shelved/.
shelve: don't crash on file with unexpected extension in .hg/shelved/
Sun, Jan 17, 2:21 AM
martinvonz committed rHG61f8fc12e167: shelve: don't include invalid shelves in `hg shelve --list`.
shelve: don't include invalid shelves in `hg shelve --list`
Sun, Jan 17, 2:21 AM
martinvonz committed rHGae7a77a7ebc0: shelve: extract some repeated creation of shelf instances to variables.
shelve: extract some repeated creation of shelf instances to variables
Sun, Jan 17, 2:21 AM
martinvonz committed rHG3b08f56c8a11: shelve: teach new shelf class to check if .shelve file exists.
shelve: teach new shelf class to check if .shelve file exists
Sun, Jan 17, 2:21 AM
martinvonz committed rHGe79f8ae0901b: shelve: move method for creating backup to new shelf class.
shelve: move method for creating backup to new shelf class
Sun, Jan 17, 2:21 AM
martinvonz committed rHGd7f763c8c58e: shelve: make gennames() helper generate relative backup paths.
shelve: make gennames() helper generate relative backup paths
Sun, Jan 17, 2:21 AM
martinvonz committed rHG8db5fa212ab0: shelve: use listshelves() in cleanup function.
shelve: use listshelves() in cleanup function
Sun, Jan 17, 2:21 AM
martinvonz committed rHG0a69f9e640ec: shelve: inline shelvedfile.filename() since there are no callers outside class.
shelve: inline shelvedfile.filename() since there are no callers outside class
Sun, Jan 17, 2:21 AM
martinvonz committed rHGa34607b6d320: shelve: make listshelves() return shelf names instead of filenames.
shelve: make listshelves() return shelf names instead of filenames
Sun, Jan 17, 2:21 AM
martinvonz committed rHG7e300d297547: shelve: move method for getting stat (mtime) to new shelf class.
shelve: move method for getting stat (mtime) to new shelf class
Sun, Jan 17, 2:21 AM
martinvonz committed rHG14ce2eb6e8a4: shelve: open patch using new shelf class instead of open().
shelve: open patch using new shelf class instead of open()
Sun, Jan 17, 2:21 AM
martinvonz committed rHG58ca94869287: shelve: move function for opening .patch file to new shelf class.
shelve: move function for opening .patch file to new shelf class
Sun, Jan 17, 2:21 AM
martinvonz committed rHGed2f2150d57c: shelve: move method for reading .hg to new shelf class.
shelve: move method for reading .hg to new shelf class
Sun, Jan 17, 2:21 AM
martinvonz committed rHGeb7b2929ae49: shelve: move method for writing bundle to new shelf class.
shelve: move method for writing bundle to new shelf class
Sun, Jan 17, 2:21 AM
martinvonz committed rHG157305bf859f: shelve: move method for reading .shelve file to new shelf class.
shelve: move method for reading .shelve file to new shelf class
Sun, Jan 17, 2:21 AM
martinvonz committed rHGa344ec05b99c: shelve: move method for writing .shelve to new shelf class.
shelve: move method for writing .shelve to new shelf class
Sun, Jan 17, 2:21 AM
martinvonz committed rHGefc71bb71682: shelve: introduce class representing a shelf.
shelve: introduce class representing a shelf
Sun, Jan 17, 2:21 AM
martinvonz committed rHGb2a8ff736ecf: shelve: trust caller of shelvedfile.opener() to check that the file exists.
shelve: trust caller of shelvedfile.opener() to check that the file exists
Sun, Jan 17, 2:21 AM
martinvonz committed rHGa68d3386138c: shelve: raise more specific errors.
shelve: raise more specific errors
Sun, Jan 17, 2:21 AM
martinvonz committed rHG44556639f14a: shelve: remove a bundlerepo method.
shelve: remove a bundlerepo method
Sun, Jan 17, 2:21 AM
martinvonz committed rHG161313f9c467: shelve: rewrite check for unknown shelf to delete.
shelve: rewrite check for unknown shelf to delete
Sun, Jan 17, 2:21 AM
martinvonz committed rHG832a6a2efe4f: tests: add tests for corrupt .hg/shelved/ directory.
tests: add tests for corrupt .hg/shelved/ directory
Sun, Jan 17, 2:20 AM
martinvonz added a comment to D9697: shelve: rewrite check for unknown shelf to delete.

Since it only affected py2 and only failed for a while during the series, I don't think it's a big deal, but I'll fix it anyway since you reported it.

Am not sure what you are talking about since the like I provide show failure on tip (at that time) of the default branch for both python 2 *and* python 3.

Sun, Jan 17, 2:03 AM
martinvonz added inline comments to D9601: errors: use detailed exit code 50 for StorageError.
Sun, Jan 17, 1:56 AM

Sat, Jan 16

martinvonz committed rHG648d44736bd0: shelve: move listshelves() to new ShelfDir class, so caller need not pass vfs.
shelve: move listshelves() to new ShelfDir class, so caller need not pass vfs
Sat, Jan 16, 1:32 PM
martinvonz committed rHG905302072e12: shelve: also create class representing whole directory of shelves.
shelve: also create class representing whole directory of shelves
Sat, Jan 16, 1:31 PM
martinvonz committed rHGa17d4face995: shelve: add a method for deleting shelf to new shelf class.
shelve: add a method for deleting shelf to new shelf class
Sat, Jan 16, 1:31 PM
martinvonz committed rHG5c404d5e00a3: shelve: inline ".patch" constant now that it's only used in the Shelf class.
shelve: inline ".patch" constant now that it's only used in the Shelf class
Sat, Jan 16, 1:31 PM
martinvonz committed rHGbf891faceba1: shelve: use listshelves() in cleanupoldbackups().
shelve: use listshelves() in cleanupoldbackups()
Sat, Jan 16, 1:31 PM
martinvonz committed rHG20b6d76e7f1c: shelve: replace repo instance in Shelf class by vfs instance.
shelve: replace repo instance in Shelf class by vfs instance
Sat, Jan 16, 1:31 PM
martinvonz committed rHG24a3e8446fb2: shelve: make listshelves() list shelves in a given vfs.
shelve: make listshelves() list shelves in a given vfs
Sat, Jan 16, 1:31 PM
martinvonz committed rHG8500d6210763: shelve: don't crash on file with unexpected extension in .hg/shelved/.
shelve: don't crash on file with unexpected extension in .hg/shelved/
Sat, Jan 16, 1:31 PM
martinvonz committed rHG851dfb4212fb: shelve: use listdir() instead of readdir() when we don't need stat information.
shelve: use listdir() instead of readdir() when we don't need stat information
Sat, Jan 16, 1:31 PM
martinvonz committed rHG63c3ec06ff70: shelve: don't include invalid shelves in `hg shelve --list`.
shelve: don't include invalid shelves in `hg shelve --list`
Sat, Jan 16, 1:31 PM
martinvonz committed rHG895036bc9653: shelve: teach new shelf class to check if .shelve file exists.
shelve: teach new shelf class to check if .shelve file exists
Sat, Jan 16, 1:31 PM
martinvonz committed rHGc48186bda68b: shelve: extract some repeated creation of shelf instances to variables.
shelve: extract some repeated creation of shelf instances to variables
Sat, Jan 16, 1:31 PM
martinvonz committed rHG4f3265333c6a: shelve: move method for creating backup to new shelf class.
shelve: move method for creating backup to new shelf class
Sat, Jan 16, 1:31 PM
martinvonz committed rHG976a368a1696: shelve: make gennames() helper generate relative backup paths.
shelve: make gennames() helper generate relative backup paths
Sat, Jan 16, 1:31 PM
martinvonz committed rHG51f0fc71a83e: shelve: use listshelves() in cleanup function.
shelve: use listshelves() in cleanup function
Sat, Jan 16, 1:31 PM
martinvonz committed rHG99e178fddde4: shelve: inline shelvedfile.filename() since there are no callers outside class.
shelve: inline shelvedfile.filename() since there are no callers outside class
Sat, Jan 16, 1:31 PM
martinvonz committed rHG1d656da3ae4d: shelve: make listshelves() return shelf names instead of filenames.
shelve: make listshelves() return shelf names instead of filenames
Sat, Jan 16, 1:31 PM
martinvonz committed rHG12d8684754e4: shelve: move method for getting stat (mtime) to new shelf class.
shelve: move method for getting stat (mtime) to new shelf class
Sat, Jan 16, 1:31 PM
martinvonz committed rHG9c1d7ce898e7: shelve: move function for opening .patch file to new shelf class.
shelve: move function for opening .patch file to new shelf class
Sat, Jan 16, 1:31 PM
martinvonz committed rHGd6f5e8157cc0: shelve: open patch using new shelf class instead of open().
shelve: open patch using new shelf class instead of open()
Sat, Jan 16, 1:31 PM
martinvonz committed rHGa3d1e14b042f: shelve: move method for reading .hg to new shelf class.
shelve: move method for reading .hg to new shelf class
Sat, Jan 16, 1:31 PM
martinvonz committed rHG166e03f10196: shelve: move method for writing bundle to new shelf class.
shelve: move method for writing bundle to new shelf class
Sat, Jan 16, 1:31 PM
martinvonz committed rHG9cac9747d1c8: shelve: move method for reading .shelve file to new shelf class.
shelve: move method for reading .shelve file to new shelf class
Sat, Jan 16, 1:31 PM
martinvonz committed rHGae24c543ba8d: shelve: introduce class representing a shelf.
shelve: introduce class representing a shelf
Sat, Jan 16, 1:31 PM
martinvonz committed rHG4409597aa9c1: shelve: move method for writing .shelve to new shelf class.
shelve: move method for writing .shelve to new shelf class
Sat, Jan 16, 1:31 PM
martinvonz committed rHG2c1a03a34064: shelve: raise more specific errors.
shelve: raise more specific errors
Sat, Jan 16, 1:31 PM
martinvonz committed rHGdb2c6ce1d2cf: shelve: trust caller of shelvedfile.opener() to check that the file exists.
shelve: trust caller of shelvedfile.opener() to check that the file exists
Sat, Jan 16, 1:31 PM
martinvonz committed rHG1d492b8e7b98: shelve: rewrite check for unknown shelf to delete.
shelve: rewrite check for unknown shelf to delete
Sat, Jan 16, 1:31 PM
martinvonz committed rHG1f39c5a3411a: shelve: remove a bundlerepo method.
shelve: remove a bundlerepo method
Sat, Jan 16, 1:31 PM
martinvonz committed rHGb54b09ce328c: tests: add tests for corrupt .hg/shelved/ directory.
tests: add tests for corrupt .hg/shelved/ directory
Sat, Jan 16, 1:31 PM
martinvonz added a comment to D9697: shelve: rewrite check for unknown shelf to delete.

Starting with this patch, I have failure on the following test both on CI and locally:

Failed test-shelve2.t#phasebased#abortcommand#continuecommand: output changed
Failed test-shelve2.t#phasebased#abortcommand#continueflag: output changed
Failed test-shelve2.t#phasebased#abortflag#continuecommand: output changed
Failed test-shelve2.t#phasebased#abortflag#continueflag: output changed
Failed test-shelve2.t#stripbased#abortcommand#continuecommand: output changed
Failed test-shelve2.t#stripbased#abortcommand#continueflag: output changed
Failed test-shelve2.t#stripbased#abortflag#continuecommand: output changed
Failed test-shelve2.t#stripbased#abortflag#continueflag: output changed

https://foss.heptapod.net/octobus/mercurial-devel/-/jobs/152595

Sat, Jan 16, 1:28 PM
martinvonz closed D9744: shelve: move listshelves() to new ShelfDir class, so caller need not pass vfs.
Sat, Jan 16, 5:58 AM
martinvonz closed D9743: shelve: also create class representing whole directory of shelves.
Sat, Jan 16, 5:58 AM
martinvonz committed rHG6f3209cd5a38: shelve: also create class representing whole directory of shelves.
shelve: also create class representing whole directory of shelves
Sat, Jan 16, 5:58 AM
martinvonz closed D9742: shelve: add a method for deleting shelf to new shelf class.
Sat, Jan 16, 5:58 AM
martinvonz committed rHG9182177ab0bc: shelve: move listshelves() to new ShelfDir class, so caller need not pass vfs.
shelve: move listshelves() to new ShelfDir class, so caller need not pass vfs
Sat, Jan 16, 5:58 AM
martinvonz closed D9741: shelve: inline ".patch" constant now that it's only used in the Shelf class.
Sat, Jan 16, 5:58 AM
martinvonz committed rHGa4798e6818a3: shelve: add a method for deleting shelf to new shelf class.
shelve: add a method for deleting shelf to new shelf class
Sat, Jan 16, 5:58 AM
martinvonz closed D9740: shelve: use listshelves() in cleanupoldbackups().
Sat, Jan 16, 5:58 AM
martinvonz closed D9739: shelve: make listshelves() list shelves in a given vfs.
Sat, Jan 16, 5:58 AM
martinvonz committed rHG4d5119d00a2a: shelve: inline ".patch" constant now that it's only used in the Shelf class.
shelve: inline ".patch" constant now that it's only used in the Shelf class
Sat, Jan 16, 5:58 AM
martinvonz committed rHG9fe1366f86ca: shelve: use listshelves() in cleanupoldbackups().
shelve: use listshelves() in cleanupoldbackups()
Sat, Jan 16, 5:58 AM
martinvonz committed rHG30e536a0456a: shelve: make listshelves() list shelves in a given vfs.
shelve: make listshelves() list shelves in a given vfs
Sat, Jan 16, 5:58 AM
martinvonz closed D9738: shelve: replace repo instance in Shelf class by vfs instance.
Sat, Jan 16, 5:58 AM
martinvonz closed D9720: shelve: don't crash on file with unexpected extension in .hg/shelved/.
Sat, Jan 16, 5:58 AM
martinvonz committed rHGba9be8f53c93: shelve: replace repo instance in Shelf class by vfs instance.
shelve: replace repo instance in Shelf class by vfs instance
Sat, Jan 16, 5:58 AM
martinvonz closed D9737: shelve: use listdir() instead of readdir() when we don't need stat information.
Sat, Jan 16, 5:58 AM
martinvonz committed rHG758eb5757d4c: shelve: use listdir() instead of readdir() when we don't need stat information.
shelve: use listdir() instead of readdir() when we don't need stat information
Sat, Jan 16, 5:58 AM
martinvonz closed D9719: shelve: don't include invalid shelves in `hg shelve --list`.
Sat, Jan 16, 5:58 AM
martinvonz committed rHG5456fef19d6b: shelve: don't crash on file with unexpected extension in .hg/shelved/.
shelve: don't crash on file with unexpected extension in .hg/shelved/
Sat, Jan 16, 5:57 AM
martinvonz closed D9713: shelve: teach new shelf class to check if .shelve file exists.
Sat, Jan 16, 5:57 AM
martinvonz closed D9714: shelve: extract some repeated creation of shelf instances to variables.
Sat, Jan 16, 5:57 AM
martinvonz committed rHG680cc423a23e: shelve: don't include invalid shelves in `hg shelve --list`.
shelve: don't include invalid shelves in `hg shelve --list`
Sat, Jan 16, 5:57 AM
martinvonz closed D9712: shelve: move method for creating backup to new shelf class.
Sat, Jan 16, 5:57 AM
martinvonz committed rHG2a61db691b6b: shelve: extract some repeated creation of shelf instances to variables.
shelve: extract some repeated creation of shelf instances to variables
Sat, Jan 16, 5:57 AM
martinvonz committed rHGf3247b4ba19f: shelve: teach new shelf class to check if .shelve file exists.
shelve: teach new shelf class to check if .shelve file exists
Sat, Jan 16, 5:57 AM
martinvonz closed D9711: shelve: make gennames() helper generate relative backup paths.
Sat, Jan 16, 5:57 AM
martinvonz closed D9710: shelve: use listshelves() in cleanup function.
Sat, Jan 16, 5:57 AM