Commit Graph

5191 Commits

Author SHA1 Message Date
Benoit Boissinot
13bbfcaf55 make hg add of a removed file unremove the file
if a file was removed, hg add shouldn't mark the file
as added, but as normal

see issue683
2007-08-21 02:13:32 +02:00
Benoit Boissinot
b71f9f2bbf abort when adding a file in merged state 2007-08-21 02:02:08 +02:00
rupert.thurner@gmail.com
8e267a0e78 add import from url capability 2007-08-20 22:02:05 +02:00
Patrick Mezard
e2a0f6645e convert: load parent commits on-demand 2007-08-19 17:38:40 +02:00
Patrick Mezard
f5be1652a3 convert: wrap cached commits author remapping 2007-08-19 17:38:07 +02:00
Alexis S. L. Carvalho
3b929dfbb5 path_auditor: cache names of audited directories
We use a separate cache to avoid problems with

audit = path_auditor(repo.root)
audit("subrepo")
audit("subrepo/file")

whitelisting "subrepo" (which is fine) and then using the same whitelist
with "subrepo/file" (which is not fine).

Since we create a separate path_auditor for every path on the command line,
a "hg add dir/a dir/b dir/c" will still lstat dir 3 times just to audit
the paths.
2007-08-18 21:36:10 -03:00
Thomas Arendsen Hein
2f533bf4a6 Quote ^ and ~ chars in test-parentrevspec.
At least ^ causes problems on some sh implementations.
2007-08-18 20:21:14 +02:00
Alexis S. L. Carvalho
d11dad17a3 Remove demandimport.enable from dispatch.py 2007-08-18 14:25:55 -03:00
Thomas Arendsen Hein
90d76a6ec9 Enable demandimport only in scripts, not in importable modules (issue605)
This way other applications can choose if and when they want this feature,
because it might be problematic if those applications rely on ImportError.
2007-08-18 11:37:08 +02:00
Alexis S. L. Carvalho
1ee06d75a7 Merge with crew-stable 2007-08-17 23:20:13 -03:00
Alexis S. L. Carvalho
11336d4a94 Fix sshrepo.unbundle
We weren't reading all the data sent by the server.  Depending on
the system, the remote hg (actually, the remote python) could send a
"close failed: [Errno 32] Broken pipe", making some tests fail.
2007-08-17 22:43:38 -03:00
Alexis S. L. Carvalho
de2d9c54e8 run-tests.py: pass --install-scripts to setup.py
This avoids possible problems when the user has a ~/.pydistutils.cfg.
Fixes issue638.  Patch provided by Ralf Schmitt.
2007-08-17 22:43:38 -03:00
Peter Meerwald
263e23ecf3 recognize user:password in URLs that include port numbers.
when giving user/pwd in an URL, eg.
hg pull http://user:pwd@host.com:666/hg/something,
hg would still ask for user/pwd in interactive mode (or fail in
non-interactive)
2007-08-17 22:43:38 -03:00
Alexis S. L. Carvalho
d999b43c2b convert: fix mercurial_sink.putcommit
Changeset 31be2f4d36a5 added some code to putcommit to avoid creating a
revision that touches no files, but this can break regular conversions
from some repositories:

- conceptually, since we're converting a repo, we should try to make
  the new hg repo as similar as possible to the original repo - we
  should create a new changeset, even if the original revision didn't
  touch any files (maybe the commit message had some important bit);

- even if a "regular" revision that doesn't touch any file may seem
  weird (and maybe even broken), it's completely legitimate for a merge
  revision to not touch any file, and, if we just skip it, the
  converted repo will end up with wrong history and possibly an extra
  head.

  As an example, say the crew and main hg repos are sync'ed.  Somebody
  sends an important patch to the mailing list.  Matt quickly applies
  and pushes it.  But at the same time somebody also applies it to crew
  and pushes it.  Suppose the commit message ended up being a bit
  different (say, there was a typo and somebody didn't fix it) or that
  the date ended up being different (because of different patch-applying
  scripts): the changeset hashes will be different, but the manifests
  will be the same.

  Since both changesets were pushed to public repos, it's hard to recall
  them.  If both are merged, the manifest from the resulting merge
  revision will have the exact same contents as its parents - i.e. the
  merge revision really doesn't touch any file at all.

To keep the file filtering stuff "working", the generic code was changed
to skip empty revisions if we're filtering the repo, fixing a bug in the
process (we want parents[0] instead of tip).
2007-08-17 20:18:05 -03:00
Alexis S. L. Carvalho
e60e53981a Add parentrevspec extension 2007-08-17 17:33:27 -03:00
Alexis S. L. Carvalho
0f222fbdf3 Move enabling of demandimport to dispatch.py
This avoids loading many modules before enabling demandimport.
2007-08-17 17:33:27 -03:00
Alexis S. L. Carvalho
dc23a7db18 Move cmdtable and reposetup handling out of extensions.py
A new function (extensions.extensions) allows the code that is
interested in those attributes to handle them directly.

This allows some cleanups of extensions.py.  Notably, we can
remove the extensions.commandtable hack.

It also makes it easier to add standard extension attributes,
like a "hgwebsetup" function or a "helptable" dict that augments
the data in help.py, etc.
2007-08-17 17:33:27 -03:00
Thomas Arendsen Hein
3574aa1bb0 Adjust contrib/hg-ssh for moved dispatch() function. 2007-08-17 19:11:16 +02:00
Matt Mackall
7065cf1716 Merge with crew 2007-08-17 00:35:16 -05:00
Benoit Boissinot
0369364273 merge with -stable 2007-08-17 00:43:49 +02:00
Benoit Boissinot
c012edc900 clone: do not delete the target if only the update fails 2007-08-17 00:42:22 +02:00
Patrick Mezard
00675ab747 Merge with crew-stable 2007-08-16 08:23:14 +02:00
Patrick Mezard
c0f833cdb2 Merge with hg-stable 2007-08-16 08:19:15 +02:00
Brendan Cully
5547c2d64a Merge with crew-stable 2007-08-15 16:22:12 -07:00
Brendan Cully
ac725f5988 mq: truncate patch just before rewriting header 2007-08-15 16:20:10 -07:00
Matt Mackall
57b8fee517 verify: report expected linkrev 2007-08-15 16:55:15 -05:00
Matt Mackall
c08427e0e8 dispatch: move command dispatching into its own module
- move command dispatching functions from commands and cmdutil to dispatch
- change findcmd to take a table argument
- remove circular import of commands in cmdutil
- privatize helper functions in dispatch
2007-08-15 16:55:13 -05:00
Brendan Cully
54828484dd convert: raise Abort instead of NoRepo when CVS pserver auth fails.
At this point we know the source is CVS, so we should not go through
the rest of the converters.
2007-08-15 14:38:18 -07:00
Matt Mackall
1d9daf6473 move parseurl from cmdutil to hg 2007-08-15 16:10:36 -05:00
Matt Mackall
2bf7253b8a fix-up references to repo.RepoError 2007-08-15 16:10:24 -05:00
Matt Mackall
b4f06de2ba remove unneeded imports of mdiff 2007-08-15 16:09:50 -05:00
Matt Mackall
abd8b8c87b Merge with stable 2007-08-15 15:56:39 -05:00
Matt Mackall
8f44013035 test-grep: use lowercase hg command 2007-08-15 15:30:33 -05:00
Brendan Cully
0893e6763c convert: hg: optionally create branches as clones
If convert.hg.clonebranches is set, branches will be created as clones of
their parent revisions. All clones will be subdirectories of the
destination path.
2007-08-15 13:21:23 -07:00
Sascha Wilde
dddf718ec2 Use smerge minor mode in emacs to resolve conflicts.
The condition-case is used to suppress errors with emacs versions before 21.
2007-08-15 17:27:51 +02:00
Patrick Mezard
4ad44c80f1 Merge with crew-stable 2007-08-15 16:43:40 +02:00
Patrick Mezard
04cf5bb0f5 test-grep: test issue 685 2007-08-15 16:18:40 +02:00
Patrick Mezard
498ca5601a Fix issue 685: trackback in grep -r after rename 2007-08-15 16:09:04 +02:00
Thomas Arendsen Hein
c6dbd813b7 merge with crew-stable 2007-08-14 21:36:08 +02:00
Patrick Mezard
8169b36e09 Merge with crew-stable 2007-08-14 19:30:14 +02:00
Patrick Mezard
e1556e1cd2 hghave: test hotshot dependencies (debian does not provide profile) 2007-08-14 19:25:49 +02:00
Patrick Mezard
f54fb44413 Merge with crew-stable 2007-08-14 19:06:10 +02:00
Patrick Mezard
3f797895fa test-profile: fix grep, check hotshot availability 2007-08-14 18:53:45 +02:00
Benoit Boissinot
eb931a15ff fix bundlerepo broken by f778fb08323c
since we now use struct in case of lazy parser, this have to be an integer
instead of None
see issue681
2007-08-14 18:25:27 +02:00
Benoit Boissinot
f25ebf4477 merge with -stable 2007-08-14 17:20:51 +02:00
Patrick Mezard
1c4c581aa9 Merge with crew-stable 2007-08-14 16:30:38 +02:00
Patrick Mezard
0e4dfe7a43 Test --time, --profile and --lsprof 2007-08-14 16:27:35 +02:00
Patrick Mezard
38b7c18bab demandimport: ignore resource module, not available under Windows. 2007-08-14 16:03:15 +02:00
Guillaume Chazarain
011bd031bd Return 0 as 'hg bisect reset' is successful 2007-08-14 14:29:36 +02:00
Brendan Cully
f3948130fd imerge: simplify c3b3184057da 2007-08-13 11:58:47 -07:00