Commit Graph

451 Commits

Author SHA1 Message Date
Patrick Mezard
12ec5fa979 convert: fix missing import 2007-09-30 12:08:33 +02:00
Bryan O'Sullivan
4f30385a85 convert: delete empty directories if deleting a file (bug 754) 2007-09-29 21:08:14 -07:00
Alexis S. L. Carvalho
6f75c91b5f convert_git: avoid returning two entries for the same file in getchanges
This could happen in merge changesets if the merged file was different
from both parents.
2007-09-24 19:00:11 -03:00
Alexis S. L. Carvalho
38a7ae7001 mq: fix qrefresh -e with no patches applied 2007-09-24 19:00:11 -03:00
Patrick Mezard
8577cf36be convert: workaround for cvsps.cache under Windows
In non-cygwin environment, cvsps fails to create its cache directory and redirect its output to stderr. Just ignore the error and capture stderr as well.
2007-09-14 22:17:53 +02:00
Patrick Mezard
7d74b8608f convert: fix remote cvs file paths separator 2007-09-14 22:17:53 +02:00
Patrick Mezard
fc230fc7bd convert: avoid interpreting Windows path as CVS connection strings.
CVS connection strings regexp detect colons to separate protocols from path and login. Unfortunately, Windows paths contains colons and were interpreted as rsh connection strings.
2007-09-14 22:17:53 +02:00
Patrick Mezard
93f1b14c12 convert: call popen2 in binary mode, with a command string. 2007-09-14 22:17:53 +02:00
Patrick Mezard
239ea63571 extdiff: avoid repr() doubling paths backslashes under Windows 2007-09-10 23:36:01 +02:00
Alexis S. L. Carvalho
420ceda070 avoid double slash problem mentioned in issue695 2007-08-27 01:44:35 -03:00
Patrick Mezard
e0104ee85f convert: fix /dev/null redirections under Windows 2007-08-26 19:05:19 +02:00
Patrick Mezard
6202bc3003 convert: fix issue702 about GIT_DIR= construct unsupported under Windows. 2007-08-26 14:51:27 +02:00
Brendan Cully
b0c6674f4c convert: gitcmd wrapper for os.popen 2007-07-01 21:09:08 -07:00
Brendan Cully
ac725f5988 mq: truncate patch just before rewriting header 2007-08-15 16:20:10 -07:00
Guillaume Chazarain
011bd031bd Return 0 as 'hg bisect reset' is successful 2007-08-14 14:29:36 +02:00
Thomas Arendsen Hein
b9ea9bfdb1 CVS import: Support new-style .cvspass-file format.
Based on an email from Ralf.Leibold at nuance dot com
2007-08-07 15:56:26 +02:00
Thomas Arendsen Hein
001b7980f8 Remove trailing spaces 2007-08-07 10:24:33 +02:00
Bryan O'Sullivan
e1c7de520a mq: autodetect an existing git patch during qrefresh (issue 491) 2007-07-16 16:50:47 -07: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
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
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