facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-11 01:07:15 +03:00
Code Issues Projects Releases Wiki Activity
6,374 Commits 25 Branches 62 Tags 325 MiB
f6b95792a5
Commit Graph

949 Commits

Author SHA1 Message Date
Kevin Christen
b4e5110cee Add colored output to status and qseries commands 2007-12-31 09:15:39 -06:00
Christian Ebert
25f9c1f1c6 patchbomb: simplify some line continuations 2007-12-30 14:43:03 +01:00
Christian Ebert
bce3304993 patchbomb: add linebreaks after colons (coding style) 2007-12-30 14:24:03 +01:00
Matt Mackall
bee8b54b36 bisect: make bisect a built-in command 2007-12-31 18:20:34 -06:00
Matt Mackall
bf7c69c4dd bisect: faster merging 2007-12-31 18:20:34 -06:00
Matt Mackall
0976a2712a bisect: merge ancestor lists when pushing to children 
- eliminate some redundant tests and assignments
- move ancestor list merging to child update
 2007-12-31 18:20:34 -06:00
Matt Mackall
604ac21000 bisect: skip calculations on candidates with too many ancestors 
Once an ancestor list has grown past the perfect threshold, all
descendants are less optimal. Use a poison dict to avoid pointless
operations on their long ancestor lists, thus eliminating most of the
work.
 2007-12-31 18:20:34 -06:00
Matt Mackall
f92274b692 bisect: stop early if we find a perfect candidate 2007-12-31 18:20:34 -06:00
Matt Mackall
21049dc5ca bisect: find best node in ancestor collection pass 2007-12-31 18:20:34 -06:00
Matt Mackall
6cf2de2e05 bisect: calculate candidate set while finding children 2007-12-31 18:20:33 -06:00
Matt Mackall
5466598049 bisect: use a dict for children 
We fill in the children only for ancestors of badrev
 2007-12-31 18:20:33 -06:00
Matt Mackall
42a77e79cd bisect: propagate ancestor lists directly to children 
- calculate the children of all candidates
- for each candidate, combine ancestor lists
- pass ancestor lists to children
- store ancestor count

This eliminates the O(n**2) memory usage, while maintaining about the
same performance.
 2007-12-31 18:20:33 -06:00
Matt Mackall
354a88216b bisect: add noupdate option 2007-12-31 18:20:33 -06:00
Thomas Arendsen Hein
347da85c36 Removed tabs and trailing whitespace in python files 2007-12-29 19:49:48 +01:00
Thomas Arendsen Hein
d63fbb0105 merge with crew 2007-12-28 17:10:57 +01:00
Patrick Mezard
f7a359686e Merge with crew-stable 2007-12-28 16:46:44 +01:00
Kirill Smelkov
cbdc1f53db prompt: kill matchflags 
Python already lets one to embed RE flags directly in a regex, which
is a much nicer way to do things:

(?iLmsux)
        (One or more letters from the set "i", "L", "m", "s", "u", "x".)
        ...

matchflags was introduced in 14a7e862c60f, and the record extension is the only
user. I've killed matchflag, and adjusted record code appropriately.
 2007-12-28 00:03:55 -06:00
Maxim Dounin
54de122616 convert: svn-sink: copy and set properties after adding dirs/files 
We can't store properties for files we haven't added to repo. Similarly,
we can't copy file to directory we haven't added to svn yet. Remember
needed changes and apply them in putcommit().
 2007-12-27 03:14:46 +03:00
Maxim Dounin
bd23432b17 convert: allow repo root to be matched in filemap 
For consistency with "rename subdir ." syntax in filemap, also support
"rename . subdir".
 2007-12-25 21:14:11 -08:00
Bryan O'Sullivan
044477626b Merge with mpm 2007-12-19 19:23:18 -08:00
Bryan O'Sullivan
0ce5bba724 Merge with crew 2007-12-19 19:21:30 -08:00
Jesse Glick
e75d3a3d78 Issue 882: add standard hook to reject text files with CRLF. 
While the win32text extension does LF <-> CRLF conversion, and will issue a
warning in case a file already in the repository uses CRLF, it provides no
mechanism for verifying that incoming changes use LF. In a large development
team with some Windows users, it is virtually guaranteed that someone will
forget to set up the encode filter correctly and accidentally check in a file
using CRLF, which can cause warnings for other Windows users when they next
fetch changes. Since this is a general problem it is desirable to have a
pre-commit (or -push) hook available to reject such accidents earlier rather
than trying to fix them up after the fact.
 2007-12-19 17:02:31 -05:00
peter.arrenbrecht@gmail.com
86c52a7365 mq: add --currentuser and --user options to qnew and qrefresh 
These options make qnew and qrefresh add/update the "From:" header (or, if present,
the "# User" header). This allows proper attribution of patches in patch queues
with multiple contributors.
 2007-12-19 22:36:18 +01:00
Christian Ebert
7241bd8d3a highlight: fix more tracebacks by forcing util._encoding to hgweb.encoding 
This is needed in case util._encoding and hgweb.encoding conflict.
Extreme example:
HGENCODING=UTF-8
[web]
encoding = ascii

Note:
display of files whose encoding differs from HGENCODING or hgweb.encoding
behaves not exactly the same way as with highlight turned off as replacement
chars are either converted or replaced.
 2007-12-19 10:11:32 +01:00
Matt Mackall
1de0ed9a08 Merge with stable 2007-12-18 15:17:11 -06:00
Christian Ebert
f996d70387 patchbomb: break lines > 80 chars (coding style) 2007-12-18 22:50:27 +01:00
Matt Mackall
efd0dc7e97 bisect: use proper locking when updating bisect.state 2007-12-27 23:55:40 -06:00
Matt Mackall
2c1d9d3334 bisect: remove class 
- rename core function to _bisect
- rename command function to bisect
- move state management to bisect
 2007-12-27 23:55:40 -06:00
Matt Mackall
4374a62a6f bisect: keep history of all bad revisions 
- use a single state dict
- find the minimum bad revision
 2007-12-27 23:55:40 -06:00
Matt Mackall
98edd8fe9d bisect: use more standard command syntax and help 2007-12-27 23:55:40 -06:00
Matt Mackall
20c9eec942 bisect: move reporting out of core bisect function 2007-12-27 23:55:40 -06:00
Matt Mackall
c2150b8bfe bisect: add skip command 
- read/write skip lines in state
- skip candidates in skipnodes
- move bisect begin logic to next
- add skip command
 2007-12-27 23:55:40 -06:00
Matt Mackall
7caa218038 bisect: simplify state handling and init 
- use a single bisect.state file
- unify init and reset (delete the state)
- move write into good/bad
 2007-12-27 23:55:39 -06:00
Matt Mackall
b3662ecbfa bisect: remove unused imports 2007-12-27 23:55:39 -06:00
Matt Mackall
6b799c897d bisect: rename autobad/good/next 2007-12-27 23:55:39 -06:00
Matt Mackall
f29636dd67 bisect: slightly improve the help message 2007-12-27 23:55:39 -06:00
Matt Mackall
17063dc6f6 bisect: remove stale test function 2007-12-27 23:55:39 -06:00
Matt Mackall
98e6b1c3b6 bisect: use array.array rather than lists for ancestor lists 
This nearly doubles performance and cuts memory usage in half on large
bisections.
 2007-12-27 23:55:39 -06:00
Matt Mackall
762fb16074 bisect: switch individual ancestor lists from dict to list 
This saves quite a lot of memory and increases performance
 2007-12-27 23:55:39 -06:00
Matt Mackall
cff52b93cb bisect: turn ancestors into an array 
This makes things faster and eliminates the separate stop hash
 2007-12-27 23:55:39 -06:00
Matt Mackall
982653f2a9 bisect: greatly simplify the ancestor accumulating loop 2007-12-27 23:55:39 -06:00
Matt Mackall
36a17eda66 bisect: switch to rev-based calculation 
- use revlog.parentrevs in search loops
- calculate stop directly in O(N) without reachable
- move badrev check into candidates
 2007-12-27 23:55:39 -06:00
Matt Mackall
054559c4a9 bisect: fix up node vs rev naming 2007-12-27 23:55:39 -06:00
Matt Mackall
4a341be5b9 bisect: clarify some bisection code 
- rename __ancestors... to candidates
- remove head parameter (it's always badrev)
- eliminate comprehensions to shrink parents
- num_ancestors -> n_child name fix
- clarify node selection
 2007-12-27 23:55:39 -06:00
Matt Mackall
2c21ad57e0 bisect: inline num_children function 2007-12-27 23:55:39 -06:00
Matt Mackall
c433182f43 bisect: remove usage of sets 2007-12-27 23:55:39 -06:00
Matt Mackall
8431bfff31 bisect: remove stop argument to ancestors function 2007-12-27 23:55:39 -06:00
Matt Mackall
013ac03708 bisect: use bail_if_changed 
- switch to using existing bail_if_changed code
- only abort when we're about to do an update
 2007-12-27 23:55:39 -06:00
Matt Mackall
b5e59bd04e bisect: remove versionstr 2007-12-27 23:55:39 -06:00
Matt Mackall
b749d30f61 bisect: simplify lookup 
- use repo.lookup directly
- move merge check to check_clean
 2007-12-27 23:55:39 -06:00
Matt Mackall
2655c790b8 bisect: remove redundant clean checks 2007-12-27 23:55:39 -06:00
Matt Mackall
9441f83422 bisect: fold in two trivial functions 2007-12-27 23:55:39 -06:00
Matt Mackall
4ea69c713d bisect: remove two unused functions 2007-12-27 23:55:39 -06:00
Matt Mackall
ab5d78ce60 convert/svn: use util.set_flags 2007-12-27 22:29:17 -06:00
Christian Ebert
27cd5a7001 patchbomb: make "hg email -b" w/o destination work as advertised 2007-12-16 22:55:23 +01:00
Peter Arrenbrecht
977c33f8b5 mq: drop obsolete reference to 'qversion' 2007-12-13 20:35:42 +01:00
Patrick Mezard
783aa75f49 patchbomb: prompt with ui.prompt() 
Avoid Windows raw_input() issue introduced by 0f20f68c768c.
Found by Steve Borho <steve@borho.org>.
 2007-12-10 22:41:18 +01:00
Patrick Mezard
7a15f92250 convert: move commands definition to ease demandload job (issue 860) 2007-12-09 15:25:36 +01:00
Bryan O'Sullivan
d98a355588 Merge with stable 2007-12-06 13:11:36 -08:00
Christian Ebert
6965f3c58c highlight: adapt to hgweb_mode refactoring 2007-12-05 12:48:33 +01:00
Bryan O'Sullivan
314630c85c convert: some tidyups, doc improvements, and test fixes 
The various back end options are now documented.
The hg source can now be configured not to hand out a revision ID.
 2007-11-27 09:44:09 -08:00
Bryan O'Sullivan
eff109c7b0 convert: tell the source repository when a rev has been converted 
This lets us roundtrip changes between svn and hg.
 2007-11-26 17:23:20 -08:00
Bryan O'Sullivan
d991d10d66 convert: save hg revision during a convert 
This breaks hg->hg hash roundtripping, but that was fragile, didn't work
reliably, and hence arguably of little value.
 2007-11-26 14:01:31 -08:00
Patrick Mezard
80735bf58c Merge with crew-stable 2007-11-20 14:41:47 +01:00
Patrick Mezard
a9e1f119ec convert: read CVS files in chunks (issue 800) 
socket.makefile() fails on large read requests (more than 10MB) with MemoryError.
 2007-11-18 17:25:28 +01:00
Patrick Mezard
930b69add7 convert: add directories to subversion from root to leaves 2007-11-17 18:41:31 +01:00
Patrick Mezard
12b8219be3 convert: force svn:executable when execute-bit is not supported 
The util.is_exec fallback would be to ask subversion for the current value of svn:executable. Setting it directly is just simpler.
 2007-11-11 19:34:00 +01:00
Patrick Mezard
44e6544bec convert: fix svn file:// URL generation under Windows 2007-11-11 14:17:30 +01:00
Bryan O'Sullivan
e906d6af4e highlight: clean up coding style a little 2007-11-12 10:49:26 -08:00
Adam Hupp
8fafdc321a extension for synax highlighting in the hgweb file revision view 
Depends on the pygments syntax highlighting library:
http://pygments.org/
 2007-11-10 17:54:57 -05:00
Patrick Mezard
d9ba22f633 convert: fix util.popen regression in darcs converter 2007-11-10 17:09:56 +01:00
Alexis S. L. Carvalho
2e160ca8ff merge with crew-stable 2007-11-09 21:24:25 -02:00
Bryan O'Sullivan
68c398d741 convert: add support for Subversion as a sink 2007-11-07 18:26:59 -08:00
Bryan O'Sullivan
4b5495f397 convert: abstract darcs's commandline handling 2007-11-07 17:40:39 -08:00
Bryan O'Sullivan
bb3b51ecf1 convert: iterate 2007-11-07 17:07:14 -08:00
Bryan O'Sullivan
857e67d5db convert: abstract map files into a class 2007-11-07 17:06:02 -08:00
Bryan O'Sullivan
33c2bc9eb9 Merge with -stable 2007-11-05 13:20:24 -08:00
Kirill Smelkov
2de575229a [RFC] convert: fix --datesort 
The problem is that previously commit.date was used for sorting, but it's a
string like "1 Jan xxx 2007", so it it wrong to use it for sorting.

Another problem is that why we are using depth for sorting -- I have no clear
answer -- it seems to be plain wrong.

This patch is just an RFC.
 2007-12-18 14:01:34 -06:00
Christian Ebert
ad0a9d7201 highlight: pass encoding to lexers and formatter 
Try to avoid UnicodeDecodeError by:
- encoding to local
- passing util._encoding as lexer input encoding
- passing hgweb.encoding as formatter output encoding
 2007-12-12 14:44:59 +01:00
Christian Ebert
afae160a50 highlight: mandatory arguments where possible 2007-12-12 14:36:34 +01:00
Bryan O'Sullivan
c050342f77 Merge with -stable. 2007-11-02 12:15:39 -07:00
Patrick Mezard
90a7d714cf Merge with crew-stable 2007-11-01 12:37:17 +01:00
Patrick Mezard
e3792eb143 convert: fail if an external required tool is not found 2007-10-30 22:14:15 +01:00
Patrick Mezard
d3a63f2008 Merge with crew-stable 2007-10-28 09:47:54 +01:00
Benoit Boissinot
71b01c9151 merge with -stable 2007-10-26 12:37:59 +02:00
Benoit Boissinot
74d4b3eb05 gpg: use the same log message format as hg tag 2007-10-20 03:04:34 +02:00
jorendorff@mozilla.com
9562437824 mq.py: add -U option to hg qdiff command 2007-07-26 07:56:27 -04:00
Matt Mackall
3dfe783ec5 transactions: avoid late tear-down (issue641) 
We use weak references (ugh) to avoid having to manually delete
transaction references out of each call frame when an exception occurs.
 2007-07-22 14:53:57 -05:00
Matt Mackall
cd72dc7f1b Merge with crew 2007-07-21 16:44:38 -05:00
Matt Mackall
3a3bd8ec5b Make repo locks recursive, eliminate all passing of lock/wlock 2007-07-21 16:02:10 -05:00
Matt Mackall
3e13c68628 Use try/finally pattern to cleanup locks and transactions 2007-07-21 16:02:10 -05:00
Matt Mackall
c2967290a5 dirstate: add __contains__ and make __getitem__ more useful 
dirstate.state(f) == '?' -> f not in dirstate
dirstate.state(f) -> dirstate[f]
 2007-07-21 16:02:09 -05:00
Matt Mackall
bab511ec55 dirstate: make wjoin function private 2007-07-21 16:02:09 -05:00
Matt Mackall
cf691df912 dirstate: break update into separate functions 2007-07-21 16:02:09 -05:00
Thomas Arendsen Hein
c8973835b3 test-alias: Removed fallback to parentui, no longer needed since 681da44cf9e4 2007-07-21 17:56:30 +02:00
Thomas Arendsen Hein
95c8d3f7f8 Remove unused pprint import and the commented line which used it before. 2007-07-21 10:43:29 +02:00
Thomas Arendsen Hein
4c6cff621b Backout 5d79f5ed74d4 and replace ''' with """ to make some highlighting happy. 
I have tried Debian's default emacs and the current CVS version. Default emacs
doesn't have highlighting enabled (and being emacs-illiterate I don't know how
to enable it) and the CVS emacs' Python highlighting has no problems with '
characters here.
 2007-07-21 10:36:51 +02:00
Thomas Arendsen Hein
d9d3256252 removed trailing whitespace 2007-07-21 10:30:51 +02:00
Bryan O'Sullivan
17119bef10 convert/subversion: rehandle the no-tags case 2007-07-19 15:33:21 -07:00
Bryan O'Sullivan
c303898fbc convert/subversion: work around memory leak in svn's python bindings 
The svn.ra.get_log wrapper attaches the hash of changed paths for every
log entry to a global memory pool, so memory consumption increases
rapidly, with no way to free it.

Our workaround is to call this function in a child process, and feed
its results back over a pipe.  The memory consumption of the child still
grows huge (hundreds of megabytes), but at least it goes away once the
reading-the-log phase is done.
 2007-07-19 12:41:07 -07:00
Bryan O'Sullivan
e824d5ba5d convert/subversion: Simplify callback. 2007-07-18 22:44:25 -07:00
Bryan O'Sullivan
12b2410da4 convert/subversion: reduce memory usage by filtering early 
This makes up to a 50% difference in memory consumption.
 2007-07-18 19:56:36 -07:00
Bryan O'Sullivan
dd356c432e Automated merge with http://hg.intevation.org/mercurial/crew 2007-07-18 19:47:22 -07:00
Bryan O'Sullivan
b5c4639e41 convert/subversion: get converter working against plain HTTP. 2007-07-18 17:44:52 -07:00
Bryan O'Sullivan
118f017025 convert/subversion.py: str.rsplit is not available in Python 2.3 2007-07-17 15:47:32 -07:00
Bryan O'Sullivan
4946c0febe convert/subversion.py: fix bad assumptions about SVN path naming 
The SVN converter assumed that the trunk and branches paths were fixed,
and immediately under the base of the SVN URL.  Fix the second assumption,
and allow the trunk and branches paths to be reconfigured.
 2007-07-17 15:24:59 -07:00
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
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
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
Kirill Smelkov
c46ae95f3f convert: svn -- fix tags handling 
They were simply not detected.
 2007-10-13 15:25:11 +04:00
Kirill Smelkov
87c2048488 convert: svn -- fix 'exists' 
Previously 'exists' erroneously returned False for empty dirictories. This is
wrong since we want to detect even empty 'branches/' or 'tags/'.
 2007-10-13 15:22:03 +04:00
Matt Mackall
f666cf65b1 Merge with crew 
Those crew folks are getting lazy about pulling from upstream before
committing.
 2007-10-11 00:46:40 -05:00
Bryan O'Sullivan
0ec99ed035 convert: refactor sink initialisation, to remove hardcoding of hg 
We also introduce options to explicitly set the source and destination
repository types.

Improve testing of corner cases a little.
 2007-10-10 15:42:00 -07:00
Bryan O'Sullivan
1264846224 convert: add default constructor for converter_sink 2007-10-10 15:30:00 -07:00
Bryan O'Sullivan
6df62fb77c convert: make contents of "extra" dict available from sources, for sinks. 
This breaks hash preservation for hg->hg conversion, as each converted
change gets a convert_revision item added to its extra dict.  Ugh.
 2007-10-10 15:30:00 -07:00
Bryan O'Sullivan
31308e92ec convert: rename convert_svn to svn_source 2007-10-10 15:30:00 -07:00
Bryan O'Sullivan
27bb37764f convert: report errors more meaningfully if run with --traceback 2007-10-10 00:15:33 -07:00
Matt Mackall
21d438d5c0 mq: clarify queue top message 2007-10-09 17:22:38 -05:00
Benoit Boissinot
8905e2628f convert: do not output when trying to load svn bindings 2007-10-07 20:45:10 +02:00
Benoit Boissinot
7120a66c0d convert: split converters into sink/source 2007-10-07 20:44:54 +02:00
Patrick Mezard
99fd23e158 convert: fix darcs_source.pull() under windows 2007-10-07 18:59:03 +02:00
Patrick Mezard
fec1f9ad02 convert: fix darcs_source._run() under windows 2007-10-07 18:58:54 +02:00