Laurent Charignon <lcharignon@fb.com> [Tue, 17 Nov 2015 12:49:57 -0800] rev 26999
bookmarks: use repo._bookmarks.recordchange instead of repo._bookmarks.write
We move from the old api repo._bookmarks.write to the new api
repo._bookmarks.recordchange.
Laurent Charignon <lcharignon@fb.com> [Wed, 18 Nov 2015 01:36:58 -0800] rev 26998
localrepo: put bookmark move following commit in one transaction
Before this patch, making a commit on a local repo could move a bookmark and
both operations would not be grouped as one transaction. This patch makes both
operations part of one transaction. This is necessary to switch to the new api
to save bookmarks repo._bookmarks.recordchange if we don't want to change the
current behavior of rollback.
Dirstate change happening after the commit is done is now part of the
transaction mentioned above. This leads to a change in the expected output of
several tests.
The change to test-fncache happens because both lock are now released in the
same finally clause. The lock release is made explicitly buggy in this test.
Previously releasing lock would crash triggering release of wlock that crashes
too. Now lock release crash does not directly result in the release of wlock.
Instead wlock is released at garbage collection time and the error raised at
that time "confuses" python.
Siddharth Agarwal <sid0@fb.com> [Tue, 17 Nov 2015 15:43:21 -0800] rev 26997
test-resolve.t: switch to mergestate.read()
See previous patches for why we're doing this.
Siddharth Agarwal <sid0@fb.com> [Tue, 17 Nov 2015 13:58:50 -0800] rev 26996
localrepo.commit: switch to mergestate.read()
See previous patches for why we're doing this.
Siddharth Agarwal <sid0@fb.com> [Tue, 17 Nov 2015 13:57:38 -0800] rev 26995
fileset: switch to mergestate.read()
See previous patches for why we're doing this.
Siddharth Agarwal <sid0@fb.com> [Tue, 17 Nov 2015 14:20:55 -0800] rev 26994
commands.summary: switch to mergestate.read()
See previous patch for why we're doing this.
We do this with a bit of care -- it would be bad form for 'hg summary' to abort
completely if we encounter an unsupported merge record. Instead just warn about
that and continue with the rest of the summary.
Siddharth Agarwal <sid0@fb.com> [Tue, 17 Nov 2015 13:56:46 -0800] rev 26993
commands.resolve: switch to mergestate.read()
See previous patches for why we're doing this.
Siddharth Agarwal <sid0@fb.com> [Tue, 17 Nov 2015 13:56:10 -0800] rev 26992
shelve: switch to mergestate.read()
See previous patches for why we're doing this.
Siddharth Agarwal <sid0@fb.com> [Tue, 17 Nov 2015 13:55:30 -0800] rev 26991
mergestate: add a constructor that reads state from disk
At the moment it's the same as just creating a new mergestate, but we'll soon
move the _read call out of __init__ and in here.
Siddharth Agarwal <sid0@fb.com> [Tue, 17 Nov 2015 17:04:53 -0800] rev 26990
merge.applyupdates: switch to mergestate.clean()
See the previous patches for why we're doing this.