Commit Graph

6078 Commits

Author SHA1 Message Date
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
Dustin Sallings
87e7fca8b0 Option to log to only show changesets within a specified branch. 2008-02-08 21:31:03 -08:00
Alexis S. L. Carvalho
0a6e6532aa qinit -c: add ^\.hg and ^\.mq to .hgignore 2008-02-08 18:07:55 -02:00
Alexis S. L. Carvalho
c32e3d63c7 dirstate.status: avoid putting ignored files in the unknown list
If list_ignored was false, we would blindly add files not in the
dirstate to the unknown list.

This should finish fixing issue886.
2008-02-08 18:07:55 -02:00
Alexis S. L. Carvalho
72ccf087ac dirstate: don't walk ignored directories
With a pattern like '^directory$' in .hgignore, a "hg status directory"
would still walk "directory" and all its subdirs.

This is the first half of a fix for issue886.
2008-02-08 18:07:55 -02:00
Alexis S. L. Carvalho
0cc1119511 revert: don't assume ignored files will be returned in the unknown list
That's just an artifact of the current implementation, and I'll change
that soon.

Bonus points:
- we don't care about the unknown list at all
- we don't print an extra message if we try to revert a removed file
  that is not present in the target revision
2008-02-08 18:07:55 -02:00
Alexis S. L. Carvalho
4eaa054575 revert: revert clean files when only a change of flags is needed 2008-02-08 18:07:55 -02:00
Alexis S. L. Carvalho
f8619fc37e Revert 469f953b29da
Those files are supposed to be HTML 4.01, not XML.
2008-02-08 18:07:55 -02:00
Aleix Conchillo Flaque
d3422706de convert: improve gnu arch source performance and other fixes
- Improve performance by reading 'replay' output instead of
  calling 'delta' command after 'replay'. This increases speed
  significantly.

- Some times 'replay' command might fail with conflicts (don't
  know why), a new get from that revision just fixes it. So,
  if something fails, get a fresh copy from that revision and
  try from there.
2008-02-08 13:56:29 +01:00
Alexis S. L. Carvalho
8b9b7ae9bd Merge with crew-stable 2008-02-08 18:31:55 -02:00
Alexis S. L. Carvalho
8bc112b4f6 fix syntax in coverage.py, fixing run-tests.py -C
b93b3556cea6 accidentally broke things.
2008-02-08 13:16:49 -02:00
Michele Cella
d5755b1f51 fix to let test-hgwebdir pass
fixes a regression introduced in changeset 3c6008c8685a
2008-02-08 15:42:28 +01:00
Thomas Arendsen Hein
9c2727d318 merge with crew-stable 2008-02-08 11:55:17 +01:00
Dirkjan Ochtman
3539f58d90 make static-http work with empty repos (issue965) 2008-02-08 11:50:37 +01:00