Mercurial > hg > mercurial-crew-with-dirclash
diff hgext/mq.py @ 3080:82c9d1aac308
Make qrename handle directory targets; closes #333.
| author | Brendan Cully <brendan@kublai.com> |
|---|---|
| date | Wed, 13 Sep 2006 08:57:08 -0700 |
| parents | bed7cb835d8d |
| children | 240ec0e61290 |
line wrap: on
line diff
--- a/hgext/mq.py +++ b/hgext/mq.py @@ -1651,13 +1651,6 @@ def rename(ui, repo, patch, name=None, * name = patch patch = None - if name in q.series: - raise util.Abort(_('A patch named %s already exists in the series file') % name) - - absdest = q.join(name) - if os.path.exists(absdest): - raise util.Abort(_('%s already exists') % absdest) - if patch: patch = q.lookup(patch) else: @@ -1665,6 +1658,15 @@ def rename(ui, repo, patch, name=None, * ui.write(_('No patches applied\n')) return patch = q.lookup('qtip') + absdest = q.join(name) + if os.path.isdir(absdest): + name = os.path.join(name, os.path.basename(patch)) + absdest = q.join(name) + if os.path.exists(absdest): + raise util.Abort(_('%s already exists') % absdest) + + if name in q.series: + raise util.Abort(_('A patch named %s already exists in the series file') % name) if ui.verbose: ui.write('Renaming %s to %s\n' % (patch, name))