facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-07 07:17:55 +03:00
Code Issues Projects Releases Wiki Activity

rebase: fix experimental.inmemorydisallowedpaths

Browse Source 
Summary: This was just plain broken before. I added a test.

Reviewed By: DurhamG

Differential Revision: D6882388

fbshipit-source-id: 5450b50fa81d22ce0b6e9e4ed5aab1abc6755edc
This commit is contained in:
Phil Cohen 2018-02-02 15:33:37 -08:00 committed by Saurabh Singh
parent 79e07a5585
commit 361fcc697a
2 changed files with 68 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hgext/rebase.py
View File

@ -947,23 +947,29 @@ def _shoulddisableimm(ui, repo, rebaseset):
ui.log("rebase", "", rebase_rebasing_wcp=rebasingwcp)
if rebasingwcp:
whynotimm = "wcp in rebaseset"
ui.log("rebase", "disabling IMM because: %s" % whynotimm,
why_not_imm=whynotimm)
msg = "disabling IMM because: %s" % whynotimm
ui.log("rebase", msg, why_not_imm=whynotimm)
ui.debug(msg + '\n')
return True
# Check for paths in the rebaseset that are likely to later trigger
# conflicts or a mergedriver run (and thus cause the whole rebase to later
# be restarted).
#
# Note that this is crude, as it will include commits even if their
# artifacts don't need to be rebuilt (don't needs to be merged).
badpaths = ui.config("rebase", "experimental.inmemorydisallowedpaths")
if badpaths:
badpathsre = util.re.compile(badpaths)
ctxs = [repo[rev] for rev in rebaseset]
paths = set.union(set(ctx.files()) for ctx in ctxs)
sets = [set(ctx.files()) for ctx in ctxs]
paths = set.union(*sets)
for path in paths:
if badpathsre.match(path):
whynotimm = "path matched inmemory_disallowed_paths: %s" % path
ui.log("rebase", "disabling IMM because: %s" % whynotimm,
why_not_imm=whynotimm)
msg = "disabling IMM because: %s" % whynotimm
ui.log("rebase", msg, why_not_imm=whynotimm)
ui.debug(msg + '\n')
return True
return False # no change

58
tests/test-rebase-inmemory.t
View File

@ -143,7 +143,8 @@ Rebase the working copy parent, which should default to an on-disk merge even if
we requested in-memory.
$ hg up -C 3
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg rebase -r 3 -d 0 --debug | grep rebasing
$ hg rebase -r 3 -d 0 --debug | egrep 'rebasing|disabling'
disabling IMM because: wcp in rebaseset
rebasing on disk
rebasing 3:753feb6fd12a "c" (tip)
$ hg tglog
@ -197,3 +198,58 @@ Also ensure the last test works if rebasing the WCP (turning off IMM mid-call):
warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
unresolved conflicts (see hg resolve, then hg rebase --continue)
[1]
$ hg rebase --abort
rebase aborted
Test inmemorydisallowedpaths carve-out:
$ cat <<EOF >> $HGRCPATH
> [rebase]
> experimental.inmemorydisallowedpaths=c|g
> EOF
$ hg up 3
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo 'g' > g
$ hg add -q g
$ hg com -qm g
$ hg up -qC 4
$ echo 'h' > h
$ hg add -q h
$ hg com -qm h
$ hg up 0
0 files updated, 0 files merged, 4 files removed, 0 files unresolved
$ hg tglog
o 6: 02554e3f8526 'h'
|
| o 5: e8cedfb0cf72 'g'
| |
o | 4: 6af061510c70 'e -> c'
| |
| o 3: 844a7de3e617 'c'
| |
o | 2: 09c044d2cb43 'd'
| |
o | 1: fc055c3b4d33 'b'
|/
@ 0: b173517d0057 'a'
$ hg rebase -r 5 -d 0 --debug | grep disabling
disabling IMM because: path matched inmemory_disallowed_paths: g
$ hg rebase -s 3 -d 0 --debug | grep disabling
disabling IMM because: path matched inmemory_disallowed_paths: c
$ hg tglog
o 6: f3a876323b82 'g'
|
| o 5: 02554e3f8526 'h'
| |
| o 4: 6af061510c70 'e -> c'
| |
+---o 3: 844a7de3e617 'c'
| |
| o 2: 09c044d2cb43 'd'
| |
| o 1: fc055c3b4d33 'b'
|/
@ 0: b173517d0057 'a'
$ hg rebase -r 5 -d 0 --debug | grep disabling
[1]