Show More
@@ -447,18 +447,6 b' def updatestandinsbymatch(repo, match):' | |||||
447 |
|
447 | |||
448 | ui = repo.ui |
|
448 | ui = repo.ui | |
449 |
|
449 | |||
450 | # Case 0: Automated committing |
|
|||
451 | # |
|
|||
452 | # While automated committing (like rebase, transplant |
|
|||
453 | # and so on), this code path is used to avoid: |
|
|||
454 | # (1) updating standins, because standins should |
|
|||
455 | # be already updated at this point |
|
|||
456 | # (2) aborting when standins are matched by "match", |
|
|||
457 | # because automated committing may specify them directly |
|
|||
458 | # |
|
|||
459 | if getattr(repo, "_istransplanting", False): |
|
|||
460 | return match |
|
|||
461 |
|
||||
462 | # Case 1: user calls commit with no specific files or |
|
450 | # Case 1: user calls commit with no specific files or | |
463 | # include/exclude patterns: refresh and commit all files that |
|
451 | # include/exclude patterns: refresh and commit all files that | |
464 | # are "dirty". |
|
452 | # are "dirty". |
@@ -1168,11 +1168,14 b' def overriderollback(orig, ui, repo, **o' | |||||
1168 | return result |
|
1168 | return result | |
1169 |
|
1169 | |||
1170 | def overridetransplant(orig, ui, repo, *revs, **opts): |
|
1170 | def overridetransplant(orig, ui, repo, *revs, **opts): | |
|
1171 | resuming = opts.get('continue') | |||
|
1172 | repo._lfcommithooks.append(lfutil.automatedcommithook(resuming)) | |||
1171 | try: |
|
1173 | try: | |
1172 | repo._istransplanting = True |
|
1174 | repo._istransplanting = True | |
1173 | result = orig(ui, repo, *revs, **opts) |
|
1175 | result = orig(ui, repo, *revs, **opts) | |
1174 | finally: |
|
1176 | finally: | |
1175 | repo._istransplanting = False |
|
1177 | repo._istransplanting = False | |
|
1178 | repo._lfcommithooks.pop() | |||
1176 | return result |
|
1179 | return result | |
1177 |
|
1180 | |||
1178 | def overridecat(orig, ui, repo, file1, *pats, **opts): |
|
1181 | def overridecat(orig, ui, repo, file1, *pats, **opts): |
@@ -560,6 +560,20 b' changed, even if it is aborted by confli' | |||||
560 | $ cat largeX |
|
560 | $ cat largeX | |
561 | largeX |
|
561 | largeX | |
562 |
|
562 | |||
|
563 | Test that transplant updates standins for manually modified largefiles | |||
|
564 | at the 1st commit of resuming. | |||
|
565 | ||||
|
566 | $ echo "manually modified before 'hg transplant --continue'" > large1 | |||
|
567 | $ hg transplant --continue | |||
|
568 | 07d6153b5c04 transplanted as f1bf30eb88cc | |||
|
569 | $ hg diff -c tip .hglf/large1 | grep '^[+-][0-9a-z]' | |||
|
570 | -e5bb990443d6a92aaf7223813720f7566c9dd05b | |||
|
571 | +6a4f36d4075fbe0f30ec1d26ca44e63c05903671 | |||
|
572 | $ rm -f large1 | |||
|
573 | $ hg update -q -C tip | |||
|
574 | $ cat large1 | |||
|
575 | manually modified before 'hg transplant --continue' | |||
|
576 | ||||
563 | Test that "hg status" doesn't show removal of largefiles not managed |
|
577 | Test that "hg status" doesn't show removal of largefiles not managed | |
564 | in the target context. |
|
578 | in the target context. | |
565 |
|
579 |
General Comments 0
You need to be logged in to leave comments.
Login now