Commit Graph

6091 Commits

Author SHA1 Message Date
Alexis S. L. Carvalho
2af8c0c0fe revert: unify forget and remove lists
This doesn't make a difference right now, but after the next revision
some files in state 'a' may end up in the deleted list, and revert
won't be able to just remove all files in that list.
2008-02-14 18:08:16 -02:00
Alexis S. L. Carvalho
ba7e11d76b revert: only call dirstate.normal when we know the file is clean 2008-02-14 18:08:16 -02:00
Alexis S. L. Carvalho
9c841e3f7b commands.revert: don't call hg.revert
commands.revert calculates everything that has to be done and then
calls hg.revert to checkout and remove files.  Unfortunately,
hg.revert has to recalculate everything and that can take a long
while, since it always operates on the whole working dir.

Changing commands.revert to manually checkout and remove files
makes things considerably faster, especially if we're reverting
a single file in a repo with a huge number of files.

This should be enough to close issue857.
2008-02-14 18:08:16 -02:00
Alexis S. L. Carvalho
091c5b6367 revert: don't let repo.status walk the whole working dir
Problem diagnosed by pmezard.
2008-02-14 18:08:16 -02:00
Alexis S. L. Carvalho
e073cf982f Set bundle.mainreporoot only after checking that it's a local repo
Fixes issue977.
2008-02-14 18:08:16 -02:00
Thomas Arendsen Hein
f9eaeef169 Fix test-hgweb-commands.out after b72a7dbf78e0 2008-02-14 20:54:52 +01:00
Fabio Zadrozny
37a53cf616 Propagating changes back to working dirs when changing files in external 2007-08-26 21:31:18 -03:00
Patrick Mezard
f6738551fb test-convert-baz: set username with baz, not tla 2008-02-14 19:35:40 +01:00
Patrick Mezard
698a3806aa Define tla username locally in baz and tla tests
Suggested by Alexis S. L. Carvalho.
2008-02-13 00:40:18 +01:00
Matt Mackall
2bd998b87d hgweb: Fix stray quote in logo img tag 2008-02-14 10:55:17 -06:00
Matt Mackall
5a7631f0f9 hgweb: add new logos 2008-02-14 10:28:27 -06:00
Matt Mackall
99c5439b1a Add the new "droplet" logo 2008-02-14 10:25:24 -06:00
Thomas Arendsen Hein
61a257a6d9 cat --decode: Drop short option, use opts.get() instead of opts[]
- hg archive --no-decode has no short option, too, and maybe both could use
  -d in the future to select revisions by date.
- opts.get makes python scripts calling cat() happy, because they don't have
  to pass the new option.
2008-02-14 11:25:30 +01:00
Jesse Glick
1a18d77174 Option --decode for hg cat to apply decode filters.
(Does not trigger expansion of keyword arguments when using keyword
extension, though that might be desirable as well.)
2008-02-09 13:05:22 -05:00
Christian Ebert
fa355756f8 keyword: monkeypatch patch.diff for non-interactive diffs
Avoid clobbering diffs with expanded keywords eg. for
notify extension.
2008-02-13 23:49:57 +01:00
Thomas Arendsen Hein
3d8e3d2b46 merge with main 2008-02-14 00:13:20 +01:00
Alexis S. L. Carvalho
ffa3574a24 merge with crew-stable 2008-02-13 19:34:28 -02:00
Alexis S. L. Carvalho
b7de0fe439 clone: make things work when source is a repo object 2008-02-13 18:37:38 -02:00
Alexis S. L. Carvalho
d7bfbe69bb clone: expand the path before saving it in .hg/hgrc
This should fix issue976
2008-02-13 18:37:38 -02:00
Dirkjan Ochtman
5df65fdd07 better handle errors with date parsing (issue983)
Windows cannot always handle a 1970-01-01 parameter to time.mktime().
2008-02-13 16:46:43 +01:00
Dirkjan Ochtman
07127b9a05 better handle errors with date parsing (issue983)
Windows cannot always handle a 1970-01-01 parameter to time.mktime().
2008-02-13 16:46:43 +01:00
Maxim Dounin
ff250f0d9c hgweb: disable cgitb by default in hgwebdir.fcgi too 2008-02-13 05:27:04 +03:00
Patrick Mezard
939033ef4a Document and fix tla/baz conversion tests 2008-02-12 23:35:44 +01:00
Patrick Mezard
6b7a646271 convert: detect baz before tla
The former seems to handle repositories built by the latter, the opposite is not true.
2008-02-12 23:35:35 +01:00
Christian Ebert
873b99708a keyword: add glog to nokwcommands 2008-02-12 21:44:56 +01:00
Matt Mackall
11a373ad95 convert: try to be smarter about CVS branching
Better handles this case:

The output from cvsps -A -u --cvs-direct -q:
---------------------
PatchSet 1
Date: 2008/02/08 20:33:28
Author: fk
Branch: HEAD
Tag: (none)
Log:
initial

Members:
         file_one:INITIAL->1.1

---------------------
PatchSet 2
Date: 2008/02/08 20:33:32
Author: fk
Branch: branch_name
Ancestor branch: HEAD
Tag: (none)
Log:
new file on branch

Members:
         file_two:1.1->1.1.2.1
2008-02-11 16:16:05 -06:00
Christian Ebert
5ae8043b4f keyword: enable all monkey patches using _kwtemplater at reposetup
- no need for try-except block
- underscore prefix for private methods
- add doc strings
2008-02-10 08:25:09 +01:00
Maxim Dounin
73664b16b5 hgweb: disable cgitb by default 2008-02-12 19:07:45 +03:00
Aleix Conchillo Flaque
4b38213355 convert: added GNU Arch (tla) tests and related fixes 2008-02-12 11:35:06 +01:00
Aleix Conchillo Flaque
996e817ac1 convert: added gnu arch (baz) tests 2008-02-12 10:38:34 +01:00
Thomas Arendsen Hein
d67660a733 Use chmod 0770 and g+s instead of 02770 which does't work on Solaris 8. 2008-02-10 13:19:24 +01:00
Christian Ebert
23b761501c keyword: no expansion in web diffs
Expansion in hgweb view of changesets and diffs is not needed and
only distracting.

Expansion stays enable in file and archive requests where it
makes sense.
2008-02-10 04:24:59 +01:00
Christian Ebert
48114de10d keyword: make restrict entirely a kwtemplater attribute 2008-02-10 01:53:19 +01:00
Christian Ebert
9543ba8beb keyword: declare globals in a more compact way 2008-02-09 22:50:53 +01:00
Christian Ebert
beb5041c53 keyword: avoid os import by using util.splitpath 2008-02-09 22:37:51 +01:00
Bryan O'Sullivan
2cfb66a49d Automated merge with http://hg.west.spy.net/hg/hacks/hg 2008-02-09 20:43:42 -08:00
Jesse Glick
8006327c6e Strip filter name from command before passing to filter function.
The new registration of in-process data filters (introduced in
75177cef51d3 & 8c9fa240ac96) failed to correctly strip the filter name
from its arguments before passing the "command" to the filter
function. Thus a registration such as

[decode]
*.gz = compress: -9

would result in the associated filter function being called with the
argument 'compress: -9' rather than just '-9' as expected.
2008-02-09 12:27:58 -05:00
Alexis S. L. Carvalho
6b4c649e55 make the journal/undo files from transactions inherit the mode from .hg/store 2008-02-09 18:38:54 -02:00
Alexis S. L. Carvalho
515043ee36 add test-inherit-mode 2008-02-09 18:38:54 -02:00
Alexis S. L. Carvalho
98b47a9a38 hghave: detect unix-style permissions
By "unix-style" I mean:

- user/group/other permissions
- umask determines original permissions
2008-02-09 18:38:54 -02:00
Alexis S. L. Carvalho
918227be30 Make files in .hg inherit the permissions from .hg/store 2008-02-09 18:38:54 -02:00
Patrick Mezard
fec8b8be62 test-keyword: make it run under Windows
- don't cat symlink, content differs
- rewrite OS specific messages
- generate symlink with a bundle
2008-02-09 20:17:09 +01:00
Patrick Mezard
e8fa1f56b2 keyword: fix symlink detection under Windows 2008-02-09 20:17:06 +01:00
Patrick Mezard
86d030fcbd keyword: fix mq repository detection under Windows 2008-02-09 19:40:30 +01:00
Thomas Arendsen Hein
7bedf7e312 Do not abort rollback if undo.branch isn't available, but warn. 2008-02-09 19:39:01 +01:00
Thomas Arendsen Hein
d8e42b5304 Remove trailing ! from two error messages as this was confusing. 2008-02-09 19:13:57 +01:00
Thomas Arendsen Hein
4c531a9dd1 Print less scary warning when invalidating the branch cache. 2008-02-09 18:58:31 +01:00
Aleix Conchillo Flaque
dfd4ccf204 convert: support binary files, link to files (viceversa) in gnu arch 2008-02-09 17:36:42 +01:00
Thomas Arendsen Hein
8f69077cca convert: Don't decode unicode strings
This does not work with python2.3 and is probably not useful anyway with 2.4.
2008-02-09 13:13:46 +01:00
Thomas Arendsen Hein
46b0448de8 convert: Compatibility fixes for python2.3
set -> util.set
sort(reverse=True) -> sort(); reverse()
2008-02-09 13:08:02 +01:00