equal
deleted
inserted
replaced
16 ) |
16 ) |
17 from . import ( |
17 from . import ( |
18 error, |
18 error, |
19 match as matchmod, |
19 match as matchmod, |
20 merge as mergemod, |
20 merge as mergemod, |
|
21 mergestate as mergestatemod, |
21 pathutil, |
22 pathutil, |
22 pycompat, |
23 pycompat, |
23 scmutil, |
24 scmutil, |
24 util, |
25 util, |
25 ) |
26 ) |
404 elif type == b'f': |
405 elif type == b'f': |
405 prunedactions[file] = action |
406 prunedactions[file] = action |
406 elif file in wctx: |
407 elif file in wctx: |
407 prunedactions[file] = (b'r', args, msg) |
408 prunedactions[file] = (b'r', args, msg) |
408 |
409 |
409 if branchmerge and type == mergemod.ACTION_MERGE: |
410 if branchmerge and type == mergestatemod.ACTION_MERGE: |
410 f1, f2, fa, move, anc = args |
411 f1, f2, fa, move, anc = args |
411 if not sparsematch(f1): |
412 if not sparsematch(f1): |
412 temporaryfiles.append(f1) |
413 temporaryfiles.append(f1) |
413 |
414 |
414 if len(temporaryfiles) > 0: |
415 if len(temporaryfiles) > 0: |