Commit Graph

44 Commits

Author SHA1 Message Date
Dirkjan Ochtman
1d29e68744 change wiki/bts URLs to point to new hostname 2009-06-24 15:32:37 +02:00
Dirkjan Ochtman
0448417ea2 extensions: change descriptions for extensions providing a few commands 2009-06-24 13:42:02 +02:00
Matt Mackall
c1213eaf9d commit: drop the now-unused files parameter 2009-06-01 14:11:32 -05:00
Matt Mackall
a0b80d611a rebase: remove unneeded status call before commit 2009-06-01 13:51:21 -05:00
Martin Geisler
d6db5e0057 use ui instead of repo.ui when the former is in scope 2009-05-24 22:37:20 +02:00
Benoit Boissinot
2768c86b11 rebase: use set instead of dict 2009-05-17 02:55:22 +02:00
Patrick Mezard
c620d68ecc Merge with crew-stable 2009-05-01 12:35:13 +02:00
Patrick Mezard
832313e290 rebase: fix bug where --keepbranches could leave wrong branch in dirstate
Report and original fix by Augie Fackler <durin42@gmail.com>
2009-05-01 12:26:37 +02:00
Martijn Pieters
0a6e43e789 Fix typeerror when specifying both --rebase and --pull 2009-04-29 11:39:49 +02:00
Martijn Pieters
03d5e1ec41 Fix typeerror when specifying both --rebase and --pull 2009-04-29 11:39:49 +02:00
Martin Geisler
750183bdad updated license to be explicit about GPL version 2 2009-04-26 01:08:54 +02:00
Dirkjan Ochtman
80de6974e4 more whitespace cleanup and some other style nits 2009-04-27 12:37:19 +02:00
Matt Mackall
f6c8930392 replace various uses of list.reverse() 2009-04-26 16:50:44 -05:00
Matt Mackall
2f9b02c62d replace util.sort with sorted built-in
This is marginally faster for small and moderately-sized lists
2009-04-26 16:50:44 -05:00
Martin Geisler
7a5147b673 rebase, revlog: use set(x) instead of set(x.keys())
The latter is both unnecessary and slower.
2009-04-25 22:25:49 +02:00
Martin Geisler
1deb417a82 util: use built-in set and frozenset
This drops Python 2.3 compatibility.
2009-04-22 00:55:32 +02:00
Martin Geisler
80dd126e92 remove unnecessary outer parenthesis in if-statements 2009-04-22 01:39:47 +02:00
Ronny Pfannschmidt
0cd168d6ec switch lock releasing in the extensions from gc to explicit 2009-04-22 02:01:22 +02:00
Martin Geisler
52ce98c9a8 help texts: write command line switches as -a/--abc 2009-04-18 14:40:21 +02:00
Martin Geisler
a135216a5b upper-case command line meta variables 2009-04-08 20:43:19 +02:00
Martin Geisler
b37b6d3cd0 rebase: word-wrap help texts at 70 characters 2009-04-04 23:19:11 +02:00
Stefano Tortarolo
73c9e38e37 rebase: keep original mq patch format (Issue1574)
Rebase now doesn't make assumptions about which format has been
used for a mq patch (git or normal).
Before finalizing a patch it keeps track of the original format,
by reading its header, and then restores the format when reimporting
it.
This way it also allows for having mixed styles.

Note: this version corrects a failure in the test
2009-03-26 16:58:50 +02:00
Stefano Tortarolo
3d01e07230 rebase: don't lose rename/copy data (Issue1423) 2009-03-30 18:26:32 +02:00
Stefano Tortarolo
6016fce500 rebase: store/restore arguments correctly
Keep and keepbranches were lost after an interruption
2009-03-29 14:43:49 +02:00
Stefano Tortarolo
f885e061f2 rebase: correct help text
Show the correct parameters in help text
2009-03-29 14:47:59 +02:00
Stefano Tortarolo
bf2fa160b0 rebase: remove unused statement 2009-03-11 20:28:09 +01:00
Peter Arrenbrecht
8c3658a497 cleanup: whitespace cleanup 2009-03-23 13:13:27 +01:00
Peter Arrenbrecht
19591b6a8c cleanup: drop unused assignments 2009-03-23 13:13:06 +01:00
Stefano Tortarolo
ae208b3a98 rebase: pull --rebase updates if there is nothing to rebase 2009-01-18 19:59:51 +01:00
Matt Mackall
d3bf622cc2 error: move ParseError 2009-01-11 23:04:24 -06:00
Dirkjan Ochtman
574603a8c0 use dict.iteritems() rather than dict.items()
This should be faster and more future-proof. Calls where the result is to be
sorted using util.sort() have been left unchanged. Calls to .items() on
configparser objects have been left as-is, too.
2009-01-12 09:16:03 +01:00
Martin Geisler
cbcd677f60 lowercase ui.debug and assert output
This does not effect the log or status commands and should be okay
according to the compatibility rules.
2009-01-03 17:15:21 +01:00
Augie Fackler
1edb8ec992 rebase: add support to keep branch names
Callback on extra fields added by Patrick Mezard <pmezard@gmail.com>.
2008-11-18 21:46:01 -06:00
Dirkjan Ochtman
604b2a1406 kill some trailing spaces 2008-11-01 13:06:36 +01:00
Dirkjan Ochtman
06d26ccb2e merge with mpm 2008-10-29 11:39:32 +01:00
Benoit Boissinot
ea7fe6dacc remove unused variables 2008-10-28 19:25:26 +01:00
Matt Mackall
e564d351f3 extensions: use new wrapper functions 2008-10-22 17:34:52 -05:00
Matt Mackall
bebeb261d5 findcmd: have dispatch look up strict flag 2008-10-22 17:34:08 -05:00
Stefano Tortarolo
7658d9947c rebase: disable rollback after rebasing 2008-10-18 17:00:28 +02:00
Dirkjan Ochtman
c5e3760e1d help: better documentation intro for a few extensions 2008-10-18 16:56:39 +02:00
Stefano Tortarolo
9061d953b4 rebase: avoid redundant merges (issue1301) 2008-09-16 17:51:14 +02:00
Martin Geisler
dc4e1fa6e7 i18n: mark strings for translation in rebase extension 2008-08-31 16:12:03 +02:00
Dirkjan Ochtman
3e077a5422 strip trailing whitespace, replace tabs by spaces 2008-08-21 11:35:17 +02:00
Stefano Tortarolo
a60c518854 Add rebase extension 2008-08-18 21:16:31 +02:00