facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-11 09:17:30 +03:00
Code Issues Projects Releases Wiki Activity
5,523 Commits 25 Branches 62 Tags 327 MiB
a9e1f119ec
Commit Graph

692 Commits

Author SHA1 Message Date
Bryan O'Sullivan
1f2fa7bf13 convert/subversion.py: escape quotes to make code readable in Emacs 2007-07-17 13:08:50 -07:00
Alexis S. L. Carvalho
ae58d97874 merge with crew-stable 2007-07-17 09:28:01 -03:00
Alexis S. L. Carvalho
b476b55a4a convert: manually set encoding to UTF-8 
Right now the backends assume we're working in UTF-8 and there's
no good way to ignore the encoding when adding revisions.
 2007-07-17 09:08:29 -03:00
Bryan O'Sullivan
3ab73cd145 mq: autodetect an existing git patch during qrefresh (issue 491) 2007-07-16 16:50:47 -07:00
Bryan O'Sullivan
a4a1d041e4 patchbomb: add --desc, to specify a file containing a series description 2007-07-16 14:43:47 -07:00
Thomas Arendsen Hein
db8622096e merge with crew-stable 2007-07-15 21:05:38 +02:00
Thomas Arendsen Hein
3d7a9209df convert: Use clone's behaviour for the default destionation name. 
Adjusted the documentation for this and for the fact that the destionation is
created even if a name is specified.
 2007-07-15 21:04:07 +02:00
Brendan Cully
ee2cc772b4 convert: record the source revision in the changelog 2007-07-13 08:28:57 -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
Lee Cantey
1515fb9031 Correct inadvertent line ending change. 2007-07-09 10:59:49 -07:00
Lee Cantey
244b7b7c94 Fix for win32text corrupting files that have CRLF line endings. (issue302) 
Also generate a warning when encountering this condition.

From Shun-ichi Goto in attachment win32text-patch3.txt for issue 302.
 2007-07-09 10:46:41 -07:00
Brendan Cully
864d59c393 python 2.3 does not have sorted 2007-07-06 10:29:09 -07:00
Bryan O'Sullivan
e1c7de520a mq: autodetect an existing git patch during qrefresh (issue 491) 2007-07-16 16:50:47 -07:00
Brendan Cully
27d64c4447 convert: svn code movement (no actual changes) 2007-07-05 16:14:01 -07:00
Brendan Cully
58d7e42923 convert: svn: avoid parsing already-seen logentries due to branch following 2007-07-05 15:01:31 -07:00
Brendan Cully
ed4c3cf173 Merge with main 2007-07-05 14:32:18 -07:00
Brendan Cully
24a607c530 convert: svn: some improvements in memory usage 2007-07-05 14:31:13 -07:00
Brendan Cully
ddffa36984 convert: svn: remove svn_paths wrappers 2007-07-05 12:45:41 -07:00
Brendan Cully
d1cc733573 convert: svn: use revmap to parse only new revisions in incremental conversions 2007-07-05 12:41:58 -07:00
Brendan Cully
39cf515050 convert: export revmap to source. 
Sources may be able to use it to optimise their own log fetching
 2007-07-05 12:24:26 -07:00
Brendan Cully
6209ccf2e8 convert: svn: defer get_log parsing until after get_log completes. 
According to the documentation, it is not safe to perform any other
operation on the ra object until get_log completes.
 2007-07-05 12:18:01 -07:00
Brendan Cully
d2a6fef145 convert: move some code into common init function 2007-07-05 12:08:48 -07:00
Brendan Cully
6417597754 alias: remove dead code 2007-07-05 12:00:26 -07:00
Brendan Cully
0588c7805e convert: call superclass init from engine init functions 2007-07-05 12:00:04 -07:00
Brendan Cully
0289847474 Add alias extension 2007-07-04 13:38:49 -07:00
Brendan Cully
92fb333742 convert svn: minor improvement to tag detection. 
The better way is probably to list the latest tags directory and
look up the last log message for each entry. This is surprisingly
annoying to do.
 2007-07-03 20:22:39 -07:00
Brendan Cully
07b2fc9ea8 convert: svn merges produce hard-to-trace file entries. Ignore them for now. 2007-07-03 19:49:36 -07:00
Brendan Cully
825722ad9e convert: svn: autodetect /branches, /tags, /trunk. 
Various other branch handling improvement attempts too.
 2007-07-03 19:26:41 -07:00
Brendan Cully
a114b546b6 convert: svn: pull out broken batching code, add alpha tags support 2007-07-03 17:07:58 -07:00
Brendan Cully
e8a0e23644 convert: svn: get parent for branch creation events 2007-07-03 15:34:30 -07:00
Brendan Cully
60700a427c convert: add optional module argument to svn._fetch_revisions 2007-07-03 15:12:07 -07:00
Brendan Cully
2466b3d9ee convert: svn: parse log entries as they arrive instead of deferring it 2007-07-03 14:16:54 -07:00
Brendan Cully
3462a62549 convert: svn: move some debug output to verbose 2007-07-03 13:50:26 -07:00
Brendan Cully
0048939292 convert: another typo in svn.latest 2007-07-03 12:56:30 -07:00
Brendan Cully
efaa1dcb9a convert: typo in svn.latest 2007-07-03 12:52:13 -07:00
Brendan Cully
19d4037536 convert: svn: add function to get the latest revision touching a path 
Make it work for HTTP URLs
 2007-07-03 12:44:04 -07:00
Brendan Cully
11ae6e941f convert: svn: add an early return to move most changeset parsing out an indent level 2007-07-03 11:36:06 -07:00
Brendan Cully
256bc344d3 convert: svn: use a separate mempool for each ls in the 1.4 fallback path 2007-07-03 10:55:46 -07:00
Thomas Arendsen Hein
55ec898361 children extension: Don't abort when looking at the null revision. 
Since e3bc293c220b revlog.children only returns real children,
so this is no longer a problem.
 2007-07-03 12:50:05 +02:00
Thomas Arendsen Hein
c9b92d418a Add extension to provide the 'hg children' command (with tests) 2007-07-03 12:14:25 +02:00
Brendan Cully
8ec10514c6 convert: make convertsource option handling transparent 2007-07-02 22:33:48 -07:00
Brendan Cully
d3d4a7d3f5 convert: svn: skip revisions without file entries 2007-07-02 08:31:02 -07:00
OHASHI Hideya
e65e8661b8 interhg extension allows you to change changelog text like InterWiki. 2007-07-03 00:13:52 +09:00
Brendan Cully
300a70dc81 convert: svn: disable batched fetch - get the whole log immediately 2007-07-02 07:54:51 -07:00
Brendan Cully
4dc3f96686 convert: svn: add revnum() to convert rev to revnum 2007-07-02 07:28:54 -07:00
Brendan Cully
3633ad1c8b convert: svn: abort if module stat fails 2007-07-02 07:22:11 -07:00
Brendan Cully
fd76b646a1 convert: fetch svn changes on demand (in batches) 2007-07-01 23:28:21 -07:00
Brendan Cully
a380d8f56b convert: svn: convert branch trunk to default 2007-07-01 22:23:33 -07:00
Brendan Cully
19c00a246e convert: svn: fix fallback directory listing code when importing a submodule 2007-07-01 22:21:05 -07:00
Brendan Cully
67217d7c09 convert: remove svn debugger trap 2007-07-01 22:09:33 -07:00
Brendan Cully
27056ca3cd convert: import all branches from git repositories 2007-07-01 22:00:25 -07:00
Brendan Cully
b0c6674f4c convert: gitcmd wrapper for os.popen 2007-07-01 21:09:08 -07:00
Brendan Cully
abc3ff714b convert: gitcmd wrapper for os.popen 2007-07-01 21:09:08 -07:00
Brendan Cully
977193d42f convert: activate subversion engine 
Fail gracefully if the subversion python bindings are not installed.
Support --rev option to convert as well as URL@rev.
 2007-07-01 20:30:04 -07:00
Daniel Holth
b6da512597 convert extension: Add SVN converter 2007-07-01 23:56:11 +02:00
Daniel Holth
202219ddab convert extension: stripped-down svn transport module 2007-07-01 17:15:54 +02:00
Brendan Cully
a29de605a9 convert: split converter into convertsource and convertsink 2007-07-01 19:58:19 -07:00
Brendan Cully
7b9fcd8629 convert: move *** empty log message *** into commit class 2007-07-01 19:40:02 -07:00
Brendan Cully
b6f546b15e convert: initialize source after destination, cleaning up if source is unusable 2007-07-01 19:23:10 -07:00
Brendan Cully
ee1924281e convert: add -r argument specifying latest revision to convert 2007-07-01 15:02:15 -07:00
Brendan Cully
4ac9754fb4 convert: ove recode method into converter_source 2007-07-01 12:58:08 -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
d17146e533 Make hg glog abort if unused arguments are given. 2007-06-28 16:18:09 +02: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
Alexis S. L. Carvalho
08bab0f618 convert: "unknown" is a string 2007-06-25 18:52:12 -03:00
Hollis Blanchard
50bf402546 fix 'convert' with single commit repositories 
The attached patch passes the three 'convert' testcases, and also is
able to successfully convert the git.git repository.
 2007-06-25 14:50:25 -05: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
Eric Hopper
bb53a2c70f convert: handle new cvsps with Tags: and multiple tags. 2007-06-24 07:22:58 -07:00
Emanuele Aina
a6db33bd4a purge: add the clean alias inspired by git-clean and svn-clean 2007-06-23 22:26:22 -05:00
Emanuele Aina
5968bafc17 purge: don't delete ignored files if --all is not specified 2007-06-06 22:17:35 +02:00
Thomas Arendsen Hein
2f42bdc4f1 merge with main 2007-06-23 21:11:28 +02:00
Thomas Arendsen Hein
9270e4454c hgk: Use $HG instead of hg (see 9779a8c8d672) 2007-06-23 21:10:55 +02:00
Matt Mackall
3791779d22 convert: sometimes git forgets the author 2007-06-23 13:33:45 -05:00
Alexis S. L. Carvalho
769bdcbb59 transplant: fix locking order 2007-06-22 19:43:29 -03:00
Thomas Arendsen Hein
4d29c6dc8e Updated copyright notices and add "and others" to "hg version" 2007-06-19 08:51:34 +02:00
Thomas Arendsen Hein
483231d996 Cleanup of whitespace, indentation and line continuation. 2007-06-19 08:06:37 +02: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
Brendan Cully
760b2de090 patchbomb: fix PAGER buglet introduced in 833bc8eb2f1f 2007-06-17 20:09:35 -07:00
Patrick Mezard
e0e36eb1b2 patchbomb: page patchbomb messages only if PAGER is defined. 
Paging is complicated under win32. It is just better to avoid it by default.
 2007-06-17 20:35:43 +02:00
Patrick Mezard
f2a33f2a1b Merge with crew-stable 2007-06-17 20:08:06 +02:00
Patrick Mezard
571e9d813f patchbomb: flush ui before delegating to pager. 2007-06-17 19:40:02 +02:00
Brendan Cully
c860c88389 convert: remove pdb call. *blush* 2007-06-14 16:19:58 -07:00
Brendan Cully
3671e1a1d1 convert: fix various authormap handling bugs 2007-06-14 16:12:08 -07:00
Edouard Gomez
8076a27777 convert extension: Add support for username mapping 
Allows mapping usernames to new ones during conversion process.
 - Use -A option for first import
 - Then at the end of the conversion process and if the destination
   repo supports authorfile attribute, author map content is copied
   to the file pointed by the authorfile call.
 - On incremental conversions w/o any -A option specified, the
   destination authorfile, if any, gets read automatically.

EG: This allows mapping unix system usernames used in CVS accounts
    to a more typical "Firstname Lastname <address@server.org>" pair.
 2007-06-14 23:25:55 +02:00
Edouard Gomez
b42f104ce2 convert extension: Save a few opens on the map file 
Save a few opens on the map file adding a class attribute
 2007-06-14 23:25:55 +02:00
Thomas Arendsen Hein
19530763e6 Reverted changesets a812fb9bfa26 and f1c9e4d4a477: show @ as glog parent again. 
Repainted the bikeshed with its original color.
 2007-06-14 12:54:06 +02: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
Bryan O'Sullivan
323388d025 patchbomb: add --date option 2007-06-12 14:52:34 -07:00
Bryan O'Sullivan
d16530621b Don't validate email config if we're not sending email. 2007-06-12 14:44:47 -07:00
Bryan O'Sullivan
aaf9d65088 patchbomb: 048e644c1742 moved setremoteconfig into cmdutil 2007-06-12 14:39:36 -07:00
Matt Mackall
7daba33088 dispatch: move dispatching code to cmdutil 2007-06-11 21:09:24 -05:00
Thomas Arendsen Hein
dd9cb9b81d Fixed indentation in hgext/notify.py 2007-06-04 22:02:17 +02:00
Brendan Cully
76de3f4dbc Split convert extension into common and repository type modules 2007-06-10 20:08:47 -07:00
Thomas Arendsen Hein
c8b452e9cd Some small cleanups for convert extension: 
- repo doesn't need to be imported
- util.Abort doesn't need \n
- space after comma
- long lines
- spacing
 2007-06-09 13:17:58 +02:00
Edouard Gomez
a78099c06d Add some more smart when initializing destination repository 2007-06-07 23:16:10 +02:00
Edouard Gomez
3da6e22a8d Fix hgext/convert/__init__.py rights 2007-06-07 23:06:17 +02:00
Thomas Arendsen Hein
f6cab1195a convert: map CVS HEAD to default branch 2007-06-07 12:41:12 +02:00
Thomas Arendsen Hein
49220695bc Removed trailing whitespace and tabs from python files 2007-06-06 20:22:52 +02:00
Thomas Arendsen Hein
c25e5246ac Fixed python2.3 incompatibility (rsplit) in cvs code of convert extension 2007-06-06 20:17:03 +02:00
Edouard Gomez
1c1f8ffe29 Turns convert.py into a real extension 2007-05-25 00:56:48 +02:00
Thomas Arendsen Hein
ae50302e53 Move convert-repo to hgext/convert/__init__.py 2007-06-06 19:49:47 +02:00
Thomas Arendsen Hein
df8762ba4d graphlog: Print . instead of @ for working directory parents 
"." is accepted as an alias for the first working directory parent by -r/--rev
 2007-06-06 18:28:48 +02:00
Thomas Arendsen Hein
d5b47506f2 merge with stable 2007-06-04 22:08:42 +02:00
Alexis S. L. Carvalho
ae21f631dc merge with crew-stable 2007-06-04 00:26:53 -03:00
Patrick Mezard
ed018bae98 Merge with crew-stable 2007-06-03 17:18:48 +02:00
Bryan O'Sullivan
747ba13e75 Merge with crew. 2007-06-02 09:04:23 -07:00
Matt Mackall
8a16e5c578 mq: pass a URL to clone 2007-06-02 09:21:56 -05:00
Bryan O'Sullivan
68cbf40ee6 patchbomb: Fail early if no revs given to email 2007-05-27 14:58:59 -07:00
Bryan O'Sullivan
4cba8e678d patchbomb: Fix typo. 2007-05-27 14:54:00 -07:00
Bryan O'Sullivan
55c504cd18 patchbomb: Hoist sender config higher. 2007-05-27 14:53:46 -07:00
Bryan O'Sullivan
37507376a2 patchbomb: Validate email config before we start prompting for info. 2007-05-27 14:40:14 -07:00
Bryan O'Sullivan
ebb57c99be ui: Rename has_config to has_section. 2007-05-27 13:50:59 -07:00
Bryan O'Sullivan
89f87c2599 patchbomb: Defer the import of readline. 
If imported at the top of the module, the import appears to succeed,
but raw_input doesn't acquire magic editing fu.  I suspect this has
something to do with the newish demandimport code, because the prior
code worked with demandload.
 2007-05-27 13:41:35 -07:00
Bryan O'Sullivan
7274da938c patchbomb: Don't prompt for headers until sure we have revs to export. 
The prior behaviour was to always prompt for headers, and only then
bomb out if there were actually no revs to send.
 2007-05-27 13:29:04 -07:00
Brendan Cully
32c5d5cbaa Make mergepatch save queue now that qpush isn't. 2007-05-13 19:15:54 -07:00
Emanuele Aina
92444d96b1 purge: add --include and --exclude options 2007-05-11 17:05:44 +02:00
Bryan O'Sullivan
fd12095b02 mq: add qgoto command. 2007-05-08 13:10:27 -07:00
Bryan O'Sullivan
dedbe183d4 Fix typo in bugzilla extension. 2007-05-08 11:51:16 -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
Brendan Cully
400bdcdd02 Flesh out bisect help text 2007-04-29 17:35:03 -07:00
TK Soh
6f62ce81c5 hbisect: fix a typo in error message 2007-04-20 16:17:42 -05:00
Joel Rosdahl
cd9e37bddc Add graphlog extension 2007-04-09 10:39:28 +02:00
Brendan Cully
ef31abfcc7 Merge with crew-stable 2007-04-12 15:07:05 -07:00
Brendan Cully
a7d01d6295 mq: fix qtop when some patches beneath are guarded 2007-04-12 14:45:53 -07:00
Alexis S. L. Carvalho
ea51c7fac2 Merge with crew-stable. 2007-04-09 04:57:25 -03: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
Emanuele Aina
c4577db686 Move back the purge extension in hgext 2007-02-27 09:05:36 +01:00
John Goerzen
6c358f6844 Add a filename for the bundle 2007-03-26 20:49:57 -05:00
John Goerzen
174fda7e23 Slight refining to help text in patchbomb.py 2007-03-26 20:46:49 -05:00
John Goerzen
78c2249368 Improve documentation for patchbomb and email 2007-03-22 14:02:39 -05:00
John Goerzen
62f41606fb Add common bundle/outgoing options to hg email 2007-03-26 13:57:49 -05:00
John Goerzen
0f8beca425 Add ability to send bundles to patchbomb extension 2007-03-26 13:37:48 -05:00
Brendan Cully
d96eb0b31a Add --outgoing option to patchbomb 2007-03-22 10:40:28 -07:00
Brendan Cully
98f6a14efd transplant: fix ignoring empty changesets (eg after filter) 2007-03-20 13:13:39 -07: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
Thomas Arendsen Hein
5836375323 patchbomb: Strip more than one trailing dot (and spaces between them) 2007-03-04 18:42:31 +01:00
Thomas Arendsen Hein
fdbad87b57 patchbomb: Allow to specify subject of single-patch-series (issue475) 2007-03-04 18:40:08 +01:00
Christian Ebert
cf8f1b83bb mq: abort cleanly when invalid patch name is given to qguard 2007-03-03 17:54:13 +01:00
Thomas Arendsen Hein
92f5af0b0d merge with crew-stable 2007-03-05 19:54:21 +01:00
Alexis S. L. Carvalho
f03ddd16f8 notify: don't try to fix addresses if notify.domain is not set 2007-02-16 04:54:49 -02:00
Alexis S. L. Carvalho
86353c5094 qclone: don't call reposetup manually 2007-02-15 08:44:08 -02:00
Alexis S. L. Carvalho
de6a03262c extdiff: open files in binary mode 
Problem noticed by Darrell Gallion.
 2007-02-15 08:14:03 -02:00
Andrei Vermel
6c380c2c30 Make extdiff work at root directory 2007-02-15 12:51:43 +03:00
Sean Dague
3f956d46a5 Prevent type exception on concatenation if diffstat returns None. 
This will most often occur if diffstat is not installed in the
target platform, though may also happen in other cases where
diffstat fails to execute.

Signed-off-by: Sean Dague <sean@dague.net>
 2007-01-30 10:35:25 -05:00
Alexis S. L. Carvalho
5357b68523 fix strip'ping the second parent of a merge 2007-02-06 15:54:58 -02:00
Christian Ebert
f1ac1bb856 patchbomb: fix timezone offset in message date header 
Use mercurial.util instead of time to set and format dates.
 2007-01-13 02:15:49 +01: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
744364abd4 merge with crew-stable 2007-02-13 10:25:45 -02:00
Patrick Mezard
3863442bfc transplant: remote bundle source was not closed before deleting the fetched bundle. 
It fails under win32 because "normal" opened files cannot be removed.
 2007-02-11 18:37:23 +01: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
Brendan Cully
03ca1d2aec transplant: update to current writebundle API 2007-01-30 11:39:47 -08: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
Thomas Arendsen Hein
154a4bfab2 merge with upstream 2007-01-24 23:06:45 +01:00
Matt Mackall
40ad41301e hgk: remove embedded nulls in descriptions 2007-01-23 17:41:53 -06:00
Brendan Cully
50376bc7f9 mq: allow push if -r is given explicitly 2007-01-22 20:22:25 -08:00
Patrick Mezard
3c75788cdb Enforce unixish style for all generated patch names. 
User supplied names are left unchanged (including those loaded from series).
 2007-01-17 22:19:36 +01:00
Brendan Cully
cc266c1a0a Update transplant's merge.update call 2007-01-16 12:51:02 -08:00
Benoit Boissinot
4af82ec145 merge with -stable 2007-01-15 18:23:21 +01:00
Thomas Arendsen Hein
46055c07ca sync with -stable 2007-01-02 22:40:52 +01:00
Matt Mackall
8ed93098b6 replace filehandle version of wwrite with wwritedata 2006-12-29 20:04:31 -06:00
Benoit Boissinot
ac64b63257 mq: fix strip failing to unlink a bundle 
os.unlink doesn't know how to deal with urls
 2006-12-26 21:57:20 +01:00
Thomas Arendsen Hein
b3b0303cec Corrected synopsis for transplant. 2006-12-26 15:42:40 +01:00
Benoit Boissinot
4ac2d21a86 mq: remove unecessary code, duplicate with util.opener 2006-12-26 03:29:45 +01:00
Benoit Boissinot
e78320fa9c hgk: (re)optimize reading of changelog and manifest 2006-12-26 03:42:17 +01:00
Benoit Boissinot
2de51d26e4 mq: use contexts 2006-12-26 03:29:00 +01:00
Benoit Boissinot
764aee51ba hgk: use contexts 2006-12-26 03:27:24 +01:00
Benoit Boissinot
4df0c56a7a hgk: remove unused code, node2 is always set 2006-12-26 03:26:23 +01:00
Benoit Boissinot
0c3a966f5f extdiff: use contexts 2006-12-26 03:25:44 +01:00
Benoit Boissinot
dfdfde18a2 bugzilla: use contexts, simplify 2006-12-26 03:25:13 +01:00
Benoit Boissinot
c12c4a144e acl: use contexts 2006-12-26 03:24:51 +01:00
Benoit Boissinot
cd66ae056f remove various unused import 2006-12-25 13:37:00 +01:00
Mathieu Clabaut
35ae1218d2 Add sending date to notify message. 
When using SMTP, no date field was set into the message, which causes it to be
displayed as being send on 1st january 1970 on most MUA.
 2007-05-24 16:32:38 +02:00
Thomas Arendsen Hein
f2c2df1ab1 merge with crew-stable 2006-12-16 23:36:06 +01:00
Thomas Arendsen Hein
6857107023 Make 'hg sign' behave like other commands: Default to current parent. 2006-12-16 23:11:16 +01:00
Brendan Cully
8c26621151 Merge with crew-stable 2006-12-15 18:38:09 -08:00
Benoit Boissinot
877ef87ad8 fix strip on windows 
c: was interpreted as a protocol, prepend file: to the bundle file name
 2006-12-15 23:19:12 +01:00
Matt Mackall
296d6a7cb8 Simplify i18n imports 2006-12-14 20:25:19 -06:00
Matt Mackall
d38d83ce6b Merge with crew 2006-12-14 15:55:46 -06:00
Brendan Cully
03d8b3d838 patchbomb: use ui.edit to compose summary mail 2006-12-13 22:53:41 -08:00
Matt Mackall
f17a4e1934 Replace demandload with new demandimport 2006-12-13 13:27:09 -06:00
Matt Mackall
2623870448 Remove deprecated old-style branch support 2006-12-12 18:16:23 -06:00
Brendan Cully
ca8a1c87d4 mq: fix qheader without args when guards are applied after qtop 2006-12-12 12:40:51 -08:00
Brendan Cully
149bcf7d29 mq: auto-ignore guards in qinit -c 2006-12-11 16:40:42 -08:00
Brendan Cully
eefc767043 mq: fix explain_pushable for negative guards 2006-12-11 16:32:45 -08:00
Mathieu Clabaut
6913b00ffd Uniformisation of commit help for -m and -l. 
Addition of the -m and -l options for hg import.
 'hg tag' still lacks the --logfile option which short form conflicts with
 its --local option.
 2006-11-20 23:37:21 +01:00
Brendan Cully
844c4a922b transplant: don't add extra newlines to changelog entry in filter 2006-12-08 12:52:17 -08:00
Alexis S. L. Carvalho
3b575d7b19 fix encoding conversion of branch names when mq is loaded 2006-12-07 14:35:43 -02:00
Matt Mackall
eea72a34c4 hgk: show view in short command list 2006-12-05 16:39:54 -06:00
Alexis S. L. Carvalho
1f3671ab6b fix qseries -v and guards interaction 
- rename "status" variable to avoid shadowing an argument
- use a better test to determine whether a patch is applied
 2006-12-02 18:41:07 -02:00
Brendan Cully
8ca3b72e7e transplant: split filter args into changelog entry and patch 2006-12-01 15:43:48 -08:00
Brendan Cully
77c7691d79 transplant: log source node when recovering too. 2006-12-01 15:00:33 -08:00
Brendan Cully
e29958754d transplant: clobber old series when transplant fails 2006-12-01 14:30:17 -08:00
Brendan Cully
20dae997d6 transplant: "filtering %s\n" 2006-12-01 13:50:09 -08:00
Matt Mackall
a3525dd4cb update bugzilla extension to use ui buffers 2006-12-01 01:29:14 -06:00
Matt Mackall
bbfb5e4171 fix notify with new ui buffering 2006-12-01 01:28:20 -06:00
Brendan Cully
deae5133ad transplant: recover added/removed files after failed application 2006-11-30 13:51:58 -08:00
Brendan Cully
d88675f9d4 transplant: preserve filter changes in --continue log 2006-11-30 11:32:40 -08:00
Brendan Cully
e5abdcc7fc transplant: fix --continue; add --continue test 2006-11-30 11:09:25 -08:00
Brendan Cully
0dcb9f5388 transplant: show_changeset moved to cmdutil 2006-11-29 22:34:22 -08:00
Brendan Cully
dc483d8d44 Add transplant extension 2006-11-27 15:13:01 -08:00
Thomas Arendsen Hein
678567f5fc Make mq use changegroup.writebundle for writing strip backups. 2006-11-22 23:07:15 +01:00
Thomas Arendsen Hein
ea20cdf3f7 Removed unused ui parameter from revpair/revrange and fix its users. 2006-11-22 23:02:28 +01:00
Alexis S. L. Carvalho
f6e774dd91 qrefresh: fix handling of copies in the fast path 2006-11-20 19:32:43 -02:00
Alexis S. L. Carvalho
63b6839f96 qrefresh: fix handling of added files (including copies) in the slow path 2006-11-20 19:32:42 -02:00
Alexis S. L. Carvalho
eb62b3a806 qrefresh: respect --git even in the slow path 2006-11-20 19:32:41 -02:00
Alexis S. L. Carvalho
b298d93260 add --git option to qdiff 2006-11-20 19:32:40 -02:00
Brendan Cully
185cd7ed4a Merge with crew 2006-11-20 13:06:04 -08:00
Brendan Cully
83afafe362 mq: add --git option to qimport -r 2006-11-20 13:03:52 -08:00
Mathieu Clabaut
6971cd5b8c Issue424: mq patch loses guard when qrenamed 2006-11-19 23:47:19 +01:00
Mathieu Clabaut
86f4680be6 Make qrefresh help more explanatory for options -m, -l and -s 2006-11-19 22:02:00 +01:00
Alexis S. L. Carvalho
3a2243d8f7 fix qseries -v when there are unapplied patches 2006-11-19 17:01:59 -02:00
Marcos Chaves
794888ecba fix warnings generated by pygettext.py. 2006-11-18 17:20:38 -02:00
Matt Mackall
c50c09da0a templates: move changeset templating bits to cmdutils 2006-11-13 13:26:57 -06:00
Brendan Cully
5658cffdec mq: handle qpush -a with empty series 2006-10-31 17:24:42 -08:00
Thomas Arendsen Hein
687e4a7111 Define and use nullrev (revision of nullid) instead of -1. 2006-10-29 10:53:51 +01:00
Thomas Arendsen Hein
11cdc6b21b Merge with upstream 2006-10-27 23:09:46 +02:00
Matt Mackall
e803b50ef2 Make util.unique return a list 2006-10-27 14:06:32 -05:00
Matt Mackall
6ff42f7ea8 Make revrange return a list of ints so that callers don't have to convert 2006-10-26 17:27:07 -05:00
Brendan Cully
b632ccfd90 mq: support qimport - 2006-10-26 09:40:20 -07:00
Alexis S. L. Carvalho
aa3a52a4cd make mq play nicely with the branch cache 
- if no patches are applied, don't do anything different

- if the cache includes valid data from one of the patch revisions,
  use the cache, but don't save anything new

- if the cache has data from before the patch revisions only,
  save what the list of branches would be without the patch revisions
 2006-10-23 23:32:56 -03:00
Benoit Boissinot
3f09dfef56 use xrange instead of range 2006-10-19 14:16:51 +02:00
Brendan Cully
c3df18d34b patch: return list of modified files even when an exception is raised 
The file list is passed in as an argument and updated in place.
This fixes issue399.
 2006-10-18 10:37:34 -07:00
Alexis S. L. Carvalho
1c418d136e use ui.readsections in the acl extension 2006-10-17 17:04:26 -03:00