Mercurial > public > mercurial-scm > hg-stable
diff hgext/rebase.py @ 26748:5ba0a99ff27f
dirstate: make dirstate.write() callers pass transaction object to it
Now, 'dirstate.write(tr)' delays writing in-memory changes out, if a
transaction is running.
This may cause treating this revision as "the first bad one" at
bisecting in some cases using external hook process inside transaction
scope, because some external hooks and editor process are still
invoked without HG_PENDING and pending changes aren't visible to them.
'dirstate.write()' callers below in localrepo.py explicitly use 'None'
as 'tr', because they can assume that no transaction is running:
- just before starting transaction
- at closing transaction, or
- at unlocking wlock
author | FUJIWARA Katsunori <foozy@lares.dti.ne.jp> |
---|---|
date | Sat, 17 Oct 2015 01:15:34 +0900 |
parents | 8af610bce239 |
children | 1aee2ab0f902 |
line wrap: on
line diff
--- a/hgext/rebase.py Sat Oct 17 01:15:34 2015 +0900 +++ b/hgext/rebase.py Sat Oct 17 01:15:34 2015 +0900 @@ -628,7 +628,7 @@ merge.update(repo, p1, False, True, False) else: repo.ui.debug(" already in target\n") - repo.dirstate.write() + repo.dirstate.write(repo.currenttransaction()) repo.ui.debug(" merge against %d:%s\n" % (rev, repo[rev])) if base is not None: repo.ui.debug(" detach base %d:%s\n" % (base, repo[base]))