Bryan O'Sullivan
3ab73cd145
mq: autodetect an existing git patch during qrefresh (issue 491)
2007-07-16 16:50:47 -07:00
Brendan Cully
98b8fae908
mq: improve qclone error handling when patch directory is not a repository.
2007-07-10 09:52:32 -07:00
Brendan Cully
edeeaca988
mq: more qdelete help text tweaks
2007-06-28 09:19:08 -07:00
Brendan Cully
98fb3fa634
mq: require patch argument or revision for qdelete
2007-06-28 08:42:43 -07:00
Thomas Arendsen Hein
0b7147a667
Updated command tables in commands.py and hgext extensions.
...
- Marked for translation where extensions already had _()
- Corrected indentation
- fixed a few synopsises
2007-06-26 22:38:57 +02:00
Brendan Cully
23fe084573
mq: regularize patch header creation.
...
Do not prefix qnew patches with [mq]: when a message has been given.
Always use [mq]: as the prefix for generated commit messages.
2007-06-25 15:57:01 -07:00
Brendan Cully
6cc7a712e7
mq: support qnew -I/-X and file name lists
2007-06-25 11:13:27 -07:00
Brendan Cully
4aac760bf3
Merge with mpm
2007-06-25 10:34:53 -07:00
Brendan Cully
22d4a3bbc0
mq: document that qinit -c may be run later
2007-06-25 09:49:40 -07:00
Matt Mackall
9a11c35355
strip: move strip code to a new repair module
2007-06-25 01:26:44 -05:00
Matt Mackall
c8f5240b24
strip: simplify bundle helper
2007-06-25 01:22:45 -05:00
Matt Mackall
e2973b5e3e
strip: pull core strip logic into its own function
2007-06-24 18:22:40 -05:00
Matt Mackall
e957b05434
localrepo and dirstate: rename reload to invalidate
...
We want to avoid actually reloading if possible.
2007-06-18 13:24:34 -05:00
Alexis S. L. Carvalho
c623e457f8
mq: reduce matcher abuse
...
The match function should match only the files we're interested in.
2007-06-13 21:39:45 -03:00
Alexis S. L. Carvalho
8ece65da4d
mq: grab locks before starting a transaction
2007-06-13 19:15:58 -03:00
Matt Mackall
7daba33088
dispatch: move dispatching code to cmdutil
2007-06-11 21:09:24 -05:00
Matt Mackall
8a16e5c578
mq: pass a URL to clone
2007-06-02 09:21:56 -05:00
Brendan Cully
32c5d5cbaa
Make mergepatch save queue now that qpush isn't.
2007-05-13 19:15:54 -07:00
Bryan O'Sullivan
fd12095b02
mq: add qgoto command.
2007-05-08 13:10:27 -07:00
Brendan Cully
6fae8c6b65
Fix test-patchbomb for crew
2007-05-08 13:08:20 -07:00
Bryan O'Sullivan
b4c9f788df
MQ: tidy up if a qpush is interrupted.
...
This aborts the transaction, makes sure the dirtied dirstate isn't
written out, and cleans up the working directory.
2007-05-08 12:16:02 -07:00
Patrick Mezard
d8d1fafaa1
mq: fix qtop failure when the series ends with guarded patches.
2007-05-06 23:44:18 +02:00
Patrick Mezard
2aa0553705
Merge with crew-stable.
...
HG: changed hgext/mq.py
2007-05-07 00:12:35 +02:00
Brendan Cully
00185c3bf1
mq: account for readheaders munging in qrefresh
2007-05-01 13:23:32 -07:00
Matt Mackall
bc0f074639
Merge with stable
2007-04-15 18:42:38 -05:00
Brendan Cully
a7d01d6295
mq: fix qtop when some patches beneath are guarded
2007-04-12 14:45:53 -07:00
Matt Mackall
e293a4cd6d
Merge with stable
2007-04-10 14:05:15 -05:00
Alexis S. L. Carvalho
5907b48b37
mq: don't abort when merging a patch that removes files
2007-04-09 04:24:17 -03:00
Thomas Arendsen Hein
be73c0d3f9
merge with crew-stable
2007-03-18 20:44:58 +01:00
Thomas Arendsen Hein
a6c18d39af
Fixed synopsis for some mq commands
2007-03-18 20:39:25 +01:00
Thomas Arendsen Hein
1bd533bfe0
hg qseries -m: guards file was not ignored
2007-03-18 20:37:47 +01:00
Thomas Arendsen Hein
3c65cfc2d4
Simplified qseries and hg qapplied to fix some bugs caused by optimization:
...
- hg qapplied -v now works consistendly to hg qunapplied -v, i.e. showing
guarded (or unapplied because they were guarded during hg qpush) patches.
- hg qapplied <patchname> now works again
2007-03-18 12:20:15 +01:00
Thomas Arendsen Hein
6e23ab4e60
Fix issue443: inconsistent output of "hg qunapplied -v"
...
1. Don't skip over unpushable (guarded) unapplied patches.
2. Don't display unpushable patches, unless -v is given, otherwise
guarded and unguarded patches can't be distinguished.
2007-03-17 18:46:52 +01:00
Brendan Cully
c7cf8a52b7
mq: add qparent tag (first parent of qbase)
2007-03-14 10:45:18 -07:00
Matt Mackall
e896adead6
Merge with -stable, fix small test failure
2007-03-14 01:26:09 -05:00
Brendan Cully
a5971231f4
Remove undo log after mq operations that rollback would break
2007-03-13 21:50:42 -07:00
Brendan Cully
55ebb47049
Refresh file size after partial qrefresh.
...
This makes a subsequent hg revert; hg status work.
2007-03-13 16:27:34 -07:00
Brendan Cully
5641becd5a
Merge with crew-stable
2007-03-10 17:45:32 -08:00
Alexis S. L. Carvalho
d3e0262e32
fix qrefresh'ing an empty patch
...
This is not superefficient (the commit will have to walk the whole tree),
but it works.
2007-03-10 22:03:23 -03:00
Alexis S. L. Carvalho
264f45926a
fix qclone to a remote repo
...
This fixes issue467. -stable still needs something like revision
cb494d252290 - mq: allow push if -r is given explicitly.
In the meantime, hg qpop -a; hg qclone . ssh://... is a workaround.
2007-03-10 22:03:21 -03:00
Christian Ebert
cf8f1b83bb
mq: abort cleanly when invalid patch name is given to qguard
2007-03-03 17:54:13 +01:00
Alexis S. L. Carvalho
86353c5094
qclone: don't call reposetup manually
2007-02-15 08:44:08 -02:00
Alexis S. L. Carvalho
5357b68523
fix strip'ping the second parent of a merge
2007-02-06 15:54:58 -02:00
Alexis S. L. Carvalho
93eb041452
Merge with crew-stable
2007-03-04 09:03:21 -03:00
Ben Thomas
f9ee0d749e
Modify qpush/qpop idempotent operations to return success
...
Modify qpush/qpop such that idempotent instances of the operations
return success. That is, repeated qpush -a, qpop -a, qpush patch-name
or qpop patch-name will return success. The end goal of each of these
operations is to reach a particular state. Whether or not the patches
were already applied does not affect that state or operation status.
Likewise, be careful to retain the error status on a qpush/qpop
without arguments when the end/beginning of the series has been
reached.
2007-02-13 08:54:48 -05:00
Alexis S. L. Carvalho
daf68bc81b
mq: propagate the return error of pop
2007-02-17 04:50:03 -02:00
Alexis S. L. Carvalho
d4de823a64
merge with crew-stable
2007-02-16 05:27:37 -02:00
Alexis S. L. Carvalho
d8dc29a091
mq: qinit -c creates a repo even after a regular qinit
2007-02-09 03:48:30 -02:00
Matt Mackall
28f682beac
Merge with stable
2007-02-06 16:12:22 -06:00
Thomas Arendsen Hein
6994b7a44c
mq: Mention usage of hg add/remove/copy/rename in qrefresh help text.
2007-01-29 17:33:09 +01:00
