equal
deleted
inserted
replaced
1533 # patch already plus specified files |
1533 # patch already plus specified files |
1534 if opts.get('short'): |
1534 if opts.get('short'): |
1535 # if amending a patch, we start with existing |
1535 # if amending a patch, we start with existing |
1536 # files plus specified files - unfiltered |
1536 # files plus specified files - unfiltered |
1537 match = scmutil.matchfiles(repo, mm + aa + dd + matchfn.files()) |
1537 match = scmutil.matchfiles(repo, mm + aa + dd + matchfn.files()) |
1538 # filter with inc/exl options |
1538 # filter with include/exclude options |
1539 matchfn = scmutil.match(repo[None], opts=opts) |
1539 matchfn = scmutil.match(repo[None], opts=opts) |
1540 else: |
1540 else: |
1541 match = scmutil.matchall(repo) |
1541 match = scmutil.matchall(repo) |
1542 m, a, r, d = repo.status(match=match)[:4] |
1542 m, a, r, d = repo.status(match=match)[:4] |
1543 mm = set(mm) |
1543 mm = set(mm) |
3183 return 0 |
3183 return 0 |
3184 |
3184 |
3185 revs = scmutil.revrange(repo, revrange) |
3185 revs = scmutil.revrange(repo, revrange) |
3186 if repo['.'].rev() in revs and repo[None].files(): |
3186 if repo['.'].rev() in revs and repo[None].files(): |
3187 ui.warn(_('warning: uncommitted changes in the working directory\n')) |
3187 ui.warn(_('warning: uncommitted changes in the working directory\n')) |
3188 # queue.finish may changes phases but leave the responsability to lock the |
3188 # queue.finish may changes phases but leave the responsibility to lock the |
3189 # repo to the caller to avoid deadlock with wlock. This command code is |
3189 # repo to the caller to avoid deadlock with wlock. This command code is |
3190 # responsability for this locking. |
3190 # responsibility for this locking. |
3191 lock = repo.lock() |
3191 lock = repo.lock() |
3192 try: |
3192 try: |
3193 q.finish(repo, revs) |
3193 q.finish(repo, revs) |
3194 q.savedirty() |
3194 q.savedirty() |
3195 finally: |
3195 finally: |