facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-08 15:57:43 +03:00
Code Issues Projects Releases Wiki Activity
10,565 Commits 24 Branches 62 Tags 322 MiB
c82c9a473d
Commit Graph

643 Commits

Author SHA1 Message Date
Brendan Cully
246275eed2 Update zsh completion for new help format 2008-12-03 22:01:34 -08:00
Patrick Mezard
9b8cb99ec1 hgweb: extend [paths] syntax to match repositories recursively (issue852) 
This feature somehow duplicates [collections] but it is simpler to use and has
less issues under Windows where using absolute path as configuration file key
is not supported.

Suggested by Dirkjan Ochtman <dirkjan@ochtman.nl>
 2008-12-01 14:20:20 +01:00
Benoit Boissinot
7c64bcb65d merge with mpm 2008-11-27 01:35:12 +01:00
Mads Kiilerich
b229c34697 rpm spec: include python egg in rpm 
Better complicance with packaging guidelines
http://fedoraproject.org/wiki/Packaging/Python
http://fedoraproject.org/wiki/Packaging/Python/Eggs
 2008-11-27 01:10:27 +01:00
Mads Kiilerich
55633af5c3 buildrpm: complain when hg command isn't available 
Before it complained "You are not inside a Mercurial repository!" which wasn't true.
 2008-11-27 01:09:11 +01:00
Mads Kiilerich
d156191b6c Fix rpmlint warnings 
contrib/mercurial.spec:9: W: hardcoded-path-in-buildroot-tag /tmp/build.%{name}-%{version}-%{release}
A path is hardcoded in your Buildroot tag. It should be replaced by something
like %{_tmppath}/%name-root.

contrib/mercurial.spec:31: W: rpm-buildroot-usage %prep rm -rf $RPM_BUILD_ROOT
$RPM_BUILD_ROOT should not be touched during %build or %prep stage, as it will
break short circuiting.
 2008-11-23 18:17:02 +01:00
Mads Kiilerich
171cdd4c59 Make rpm spec less explicit 
Fixes:
* current buildrpm failing on Fedora because of unexpected zeroconf extensions
* unowned directories hgext/*/
 2008-11-23 18:16:02 +01:00
Brendan Cully
662347033e zsh: make resolve with no options only complete unresolved files 2008-11-17 11:45:38 -08:00
Brendan Cully
f8be17617f mergetools: add pointer to the usual filemerge path 2008-11-16 20:56:55 -08:00
Brendan Cully
61a488c351 zsh: support for resolve 2008-11-16 19:49:36 -08:00
Matt Mackall
8b3cb5ceff Add contrib/perf.py for performance testing 2008-11-13 12:52:03 -06:00
Matt Mackall
b2807810c6 linkrev: take a revision number rather than a hash 2008-11-12 15:19:14 -06:00
Mads Kiilerich
995611c9e8 Make contrib/buildrpm work on Fedora 9. 
mercurial.spec had bitrotted. These changes makes it possible to build an rpm that is usable.
Only minimal changes has been made, and there is plenty of room for improvement.
 2008-10-06 14:41:22 +02:00
Patrick Mezard
0d0f719f13 tests: Windows compatibility fixes 
- printenv.py, md5sum.py, simplemerge, test-archive, test-merge1,
  test-merge-symlinks: set standard streams to binary mode
- test-encode: replace "gunzip" by "gzip -d"
- test-hup: requires fifo
 2008-10-12 19:11:59 +02:00
Michael Sommerville
3ce4deef7c hgk: Display branch name for each head (issue 740) 
In the graphical view, each head is decorated with an additonal tag
containing the branch name, if that head is not on the default branch.
 2008-09-15 23:39:11 +01:00
Christian Ebert
09b34ab14b hgcommand.vim: refer Vim7 users to vcscommand plugin 2008-09-10 09:41:42 -04:00
Dirkjan Ochtman
6f2e3a456b contrib: remove deprecated darcs2hg.py script 
We've have support for darcs in the convert extension for a while now.
 2008-08-28 13:16:15 +02:00
Dirkjan Ochtman
b2e25d7f06 merge with crew-stable 2008-08-20 11:09:53 +02:00
TK Soh
84cf853d31 update copyright dates in Windows installer's readme file 2008-08-20 10:31:19 +02:00
Martin OConnor
c79872ed51 Updating Copyright dates in Windows Installer 2008-07-01 23:41:47 +01:00
Lee Cantey
99a8c73ee9 Fix bad span tag in Readme 2008-05-25 14:05:35 -07:00
Neal Becker
23032b2d99 mergetools.hgrc patch 2008-04-16 15:26:37 -07:00
byron@base2.cc
5bb9254434 Added missing --config global option to zsh_completion. 
The global options --encoding and --encodingmode where also added.
Without these options some functionality breaks.  Also added basic
completion for config items for the --config option.
 2008-07-03 20:53:14 -07:00
Dirkjan Ochtman
b4d9394e54 merge with crew-stable 2008-07-02 09:21:57 +02:00
Matt Mackall
bc715be859 add __len__ and __iter__ methods to repo and revlog 2008-06-26 14:35:50 -05:00
Lee Cantey
9090ffe5c4 Fix bad span tag in Readme 2008-05-25 13:39:08 -07:00
Neal Becker
4d6f13d80e mergetools.hgrc patch 2008-04-16 15:26:37 -07:00
Paul Moore
7113d144ac Add a batch file driver for Windows 2008-04-10 23:07:54 +02:00
Adrian Buehlmann
c7aabb085a contrib: fix binary file issues with dumprevlog on Windows 
* Fix traceback on dumprevlog: open revlog in mode 'rb' (binary)
* Set stdio to binary mode so that redirected data is not modified

References:
http://selenic.com/pipermail/mercurial/2008-March/018330.html
http://selenic.com/repo/index.cgi/hg/rev/0f20f68c768c
 2008-04-04 16:39:44 +02:00
Matt Mackall
96d3666c86 add simple dump and undump scripts to contrib/ 2008-03-31 21:49:32 -05:00
Bryan O'Sullivan
548c365ad9 mercurial.el: note new Emacs VC mode support 2008-03-27 12:52:41 -07:00
Patrick Mezard
8ad14a4450 convertrepo: make it work with refactored convert extension 2008-03-23 21:41:03 +01:00
Patrick Mezard
0c0a818562 hgk: display orphan revisions content (issue 1041) 2008-03-23 18:52:02 +01:00
Patrick Mezard
449fc02367 Make churn an official extension 2008-03-22 18:01:46 +01:00
Dennis Schoen
ccbd3f1b72 hgk: don't exit if mercurial commands only print warnings 2008-01-16 11:50:24 +01:00
Jonas Diemer
e984394797 Fixed bash completion for filenames containing spaces. 2008-03-11 23:54:03 +01:00
Stephen Deasey
8fd0ead6b5 churn: show comitter email addresses unclipped (bug 1023) 
Email addresses were being clipped at a hard-coded 20 chars. Measure
the length of all email addresses and accommodate the longest.
 2008-03-09 17:34:55 +00:00
Joel Rosdahl
4f8012378a Remove unused imports 2008-03-06 22:23:41 +01:00
Thomas Arendsen Hein
deb94bc7fe Removed trailing spaces from everything except test output 2008-03-07 00:24:36 +01:00
Thomas Arendsen Hein
6f399a19b1 merge backout 2008-02-18 19:21:33 +01:00
Thomas Arendsen Hein
4d33c02751 Backed out changeset 8105fa3c7347 (see issue971/msg5317) 2008-02-18 19:20:22 +01:00
Bryan O'Sullivan
dfa3e1ea9b profiling: allow CGI and FastCGI to be profiled 2008-02-01 13:09:45 -08:00
Thomas Arendsen Hein
3d1d8b45c7 Fixed typo: Gnerating -> Generating 2008-02-01 00:25:32 +01:00
Armin Ronacher
14aa65e30c added \r for progress counting in churn extension 2008-01-31 23:42:21 +01:00
Matt Mackall
41e5c79455 templates: move filters to their own module 
This eliminates just about all Mercurial dependencies in templater.py
 2008-01-31 14:44:19 -06:00
Matt Mackall
a849fab9e4 templater: move email function to util 2008-01-31 14:44:19 -06:00
Christian Ebert
5c18a69d2e Prefer i in d over d.has_key(i) 2008-01-20 14:39:25 +01:00
Nicholas Riley
05afc88692 [PATCH] zsh_completion tag/mq fixes 
Been using these for almost a month now without problems, so I figured
some other people might want them.

This allows the zsh completion to work with tags and mq patch names
containing spaces, and adds support for qgoto.
 2008-01-18 08:23:29 -06:00
Patrick Mezard
ba2d1c85b5 hgk: display branch name in diff header 2008-01-15 13:46:32 +01:00
Matt Mackall
1de0ed9a08 Merge with stable 2007-12-18 15:17:11 -06:00
Lee Cantey
4f90d32027 Default to 10.5 version using the default python 2.5 2007-12-10 14:54:41 -08:00
Steve Borho
957c67ad44 hgk: add black and blue as preferred colors 2007-12-10 12:16:59 -06:00
Steve Borho
90a5a885a9 win32: remove text man pages from Windows package 
The HTML versions are still packaged, and do not suffer from
eoln problems. This solves issue531 (addition through subtraction)
 2007-12-08 13:18:03 -06:00
Bryan O'Sullivan
58767a2b81 Merge with mpm 2007-12-07 21:46:08 -08:00
Steve Borho
2f5f0c75a9 win32: include zsh_completion in Windows package 2007-12-07 18:19:16 -06:00
Steve Borho
b092b562f9 win32: include contrib/vim in Windows package 2007-12-07 18:19:16 -06:00
Steve Borho
84bda28dba win32: use relative path to install source 
Remove hard-coded path to the source repo to be packaged.
 2007-12-07 18:19:16 -06:00
Steve Borho
a380954518 win32: move default install path inside program files 
All of the 'space in path' problems have been resolved, so
we can install Mercurial the Windows standard location.  The
{pf} InnoSetup variable is locale aware.
 2007-12-07 18:19:01 -06:00
Steve Borho
ae1da92108 win32: it is no longer necessary to bundle patch.exe 
Mercurial can use it's built-in mpatch library
 2007-12-07 18:18:11 -06:00
Matt Mackall
7d8a71a539 churn: avoid division by zero 2007-12-02 17:04:16 -06:00
Peter Arrenbrecht
bfb3ae9d06 Support qgoto in contrib/bash_completion. 2007-11-05 08:41:22 +01:00
bdowning@lavos.net
95bc1b9c93 hgk: change config file from .gitk to .hgk 
Git's gitk and Mercurial's hgk have diverged enough that their configuration information is no longer entirely compatible.  Whenever I run one, the other gets reset to the default screen position.  This patch changes hgk to store and read its configuration from ".hgk" instead of ".gitk", so as not to conflict with the "real" gitk anymore.
 2007-11-03 21:50:11 +01:00
Dustin Sallings
bebcdac954 Use both the from and to name in mdiff.unidiff. 
This fixes a compatibility issue with git diffs.
* * *
 2007-11-01 12:17:59 -07:00
NIIMI Satoshi
5043b722ca mq.el: define keymaps as convensions 2007-10-11 06:13:17 +09:00
NIIMI Satoshi
33f14d7efe mercurial.el: mark-marker() returns non-nil with no active mark on GNU Emacs 2007-10-11 06:10:45 +09:00
NIIMI Satoshi
d6fe209c49 mq.el: declare variable mq-top 2007-10-11 06:01:30 +09:00
NIIMI Satoshi
471e00333a mercurial.el, mq.el: remove runtime dependencies on CL package 
* (require 'cl) at compile-time

* don't use map()
 2007-10-11 05:58:54 +09:00
Matt Mackall
99c5439b1a Add the new "droplet" logo 2008-02-14 10:25:24 -06:00
Thomas Arendsen Hein
3d8e3d2b46 merge with main 2008-02-14 00:13:20 +01:00
Maxim Dounin
ff250f0d9c hgweb: disable cgitb by default in hgwebdir.fcgi too 2008-02-13 05:27:04 +03:00
Steve Borho
a42f97b40e filemerge: add 'checkchanged' merge tool property 2008-02-06 20:32:06 -06:00
Matt Mackall
0e0a073578 mergetools: correct vim typo 2008-02-04 09:53:10 -06:00
Steve Borho
351fbe22a2 filemerge: two fixes for kdiff3 example configuration 2008-02-03 22:27:53 -06:00
Matt Mackall
176caad743 filemerge: add an example set of global settings for common merge tools 2008-02-03 19:29:05 -06:00
Matt Mackall
346758f77c merge: move the bulk of simplemerge into core 
- keep existing simplemerge command in contrib
- clean up test interface
 2008-02-03 19:29:05 -06:00
Georg.Koltermann@mscsoftware.com
0e65b396d5 hgk: colorize commits by authors 
Color commits by author. Colors will be assigned to authors by using a configurable list of colors. The line corresponding to current id (the version currently in the working tree) is highlighted in a special font which is also configurable. There is provision to assign fixed colors to authors. See .gitk comment for details.
 2007-04-12 13:11:30 +02:00
Christian Ebert
efbbc0df82 churn: simplify code to get terminal width 2007-09-12 12:54:36 +02:00
TK Soh
630bf5e215 hgk: allow any extdiff command for visual diff 2007-10-08 11:18:34 +08:00
Patrick Mezard
0e612978e0 hgk: add basic usage and configuration documentation 2007-10-05 23:40:33 +02:00
Patrick Mezard
8dbf0b280f hgk: add context menu visual diff action 
* * *
 2007-10-02 23:28:04 +02:00
Patrick Mezard
510efc6c01 hgk: add debug-config command to pass configuration options 2007-10-05 22:39:36 +02:00
Patrick Mezard
671b107790 hgk: fix right-mouse button handling under macosx 2007-10-02 23:28:02 +02:00
Bryan O'Sullivan
ecdd764817 convert: support darcs as a source repo 2007-10-02 13:49:11 -07:00
Bryan O'Sullivan
cf0914fc76 Merge with crew. 2007-09-29 20:55:36 -07:00
Brendan Cully
04f2479b21 Updated zsh completion from issue722. 2007-09-14 21:47:40 -07:00
Terry Smith
48df6ab798 darcs2hg: Added support for darcs tags. 2007-09-11 13:30:37 -04:00
Terry Smith
1189358bfb darcs2hg: Now detects and recovers from simple darcs conflicts. 2007-09-11 13:13:54 -04:00
Terry Smith
93e0edd2dc darcs2hg: Now understands files that were explicitly renamed in darcs. 2007-09-11 12:42:52 -04:00
Steve Borho
5a6d8a2860 hgk: add repo root to window title 2007-09-05 21:53:59 +02:00
Benoit Boissinot
6addb45a89 cgi: sys.path.insert should be before importing mercurial 
thanks to R. Burke
 2007-08-25 16:31:37 +02: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
Thomas Arendsen Hein
3574aa1bb0 Adjust contrib/hg-ssh for moved dispatch() function. 2007-08-17 19:11:16 +02:00
Thomas Arendsen Hein
e34927453f Remove trailing spaces, fix indentation 2007-08-07 10:28:43 +02:00
Thomas Arendsen Hein
a799589be4 merge with crew-stable 2007-08-07 10:28:14 +02:00
Thomas Arendsen Hein
001b7980f8 Remove trailing spaces 2007-08-07 10:24:33 +02:00
Patrick Mezard
475f65528e hgk: enable mouse wheel under Windows. 
For some reason, MouseWheel events are not routed under windows even in latest ActiveTcl 8.4.15 while they are under linux and macosx. These events are activated using code supplied with Tcl Tip 171: <http://www.tcl.tk/cgi-bin/tct/tip/171.html>. Strangely, the Tip code almost work but generates some unexpected infinite loop which is fixed using a simple boolean to check reentrancy.
 2007-07-22 16:21:49 +02:00
Patrick Mezard
20a41666e1 hgk: enable mouse wheel on MouseWheel events. 
At this point, mouse wheel still does not work under Windows.
 2007-07-22 16:21:49 +02:00
Christian Ebert
614aa178a1 churn: get current terminal width if possible 2007-07-19 18:39:51 +02:00
jon.christopher@Rigaku.com
db9543cd23 Re: mercurial.el and hg-version-other-window 
hg-version-other window is unimplemented in mercurial.el.  The version
below works for me, YMMV.
 2007-07-14 11:27:58 -05:00
Thomas Arendsen Hein
e7f3af8440 merge with crew-stable 2007-07-06 08:55:36 +02:00
Lee Cantey
b7b57a0fbc Add html docs and use for help shortcut 2007-07-05 15:40:29 -07:00
Lee Cantey
d44c55c0f5 Remove specific version requirement and point to latest versions of Mac Python downloads. 2007-07-03 04:18:24 -07:00
Thomas Arendsen Hein
ab2d8805b8 Merge with crew-stable 2007-07-01 19:19:42 +02:00
Thomas Arendsen Hein
34b7fe0900 Make hgk handle filenames with spaces (issue49) 2007-07-01 19:15:25 +02:00
Thomas Arendsen Hein
03bf1f420d Use "--config ui.report_untrusted=false" for hg calls in hgk, fixes issue523. 
tcl's exec yields an error if output to stderr happens and isn't redirected to
a file, so the warnings about untrusted .hg/hgrc caused problems in hgk.
The warning is still printed when executing 'hg view', so the user can see it
when using it from the shell.
 2007-07-01 15:22:49 +02:00
Brendan Cully
f1750b4537 Merge with Adam Spiers 2007-06-30 08:31:23 -07:00
Adam Spiers
53cdf9de29 mercurial.spec: convert extension now installs files into hgext/convert/ 2007-06-30 01:21:41 +01:00
Adam Spiers
628e7b3fec buildrpm: fix rpm release number calculation 
It was broken when patch queues were in use.
 2007-06-30 01:21:41 +01:00
Lee Cantey
bcfa3d34a8 Convert default mercurial.ini file to Windows line endings 2007-06-29 13:06:49 -07:00
Bryan O'Sullivan
753061d492 Update binary installer files. 2007-06-25 16:35:27 -07:00
Adam Spiers
84fdb1c81b buildrpm: auto-generate %changelog in .spec file 
Top entry is tip; subsequent entries are the version tags from .hgtags.
 2007-06-03 14:42:39 +01:00
Adam Spiers
befe0e3cb2 mercurial.spec: include CONTRIBUTORS, COPYING and man pages in rpm 2007-06-30 01:21:22 +01:00
Adam Spiers
34346718e5 mercurial.spec: include various utility files from contrib/ in rpm 
Files included:
hgk
convert-repo
hg-ssh
hg-viz
git-rev-tree
bash_completion
zsh_completion
mercurial.el
 2007-06-03 14:40:56 +01:00
NIIMI Satoshi
ad08d10949 mercurial.el: ignore errors on hg-after-save-hook() 
Don't signal an error even if running hg command fails.  Otherwise,
succeeding hooks won't be called.
 2007-05-22 07:24:06 +09:00
NIIMI Satoshi
2d751dee3c mercurial.el: change default log range to tip:0 
If the tip revision is smaller than hg-rev-completion-limit (defaults
to 100), "hg log -r tip:-100" fails.

Since performance does not differ between "hg log -l 50 -r tip:0" and
"hg log -l 50 -r tip:-100" even on large repository, default range can
be changed from "tip:-100" to "tip:0" without any drawbacks.
 2007-05-22 08:05:16 +09:00
Thomas Arendsen Hein
9270e4454c hgk: Use $HG instead of hg (see 9779a8c8d672) 2007-06-23 21:10:55 +02:00
Thomas Arendsen Hein
4d29c6dc8e Updated copyright notices and add "and others" to "hg version" 2007-06-19 08:51:34 +02:00
Lee Cantey
dd5e7d8612 Fixes to not require administrator privleges and use private copies of DLLs when running the Windows installer. 
Initial version from Shun-ichi GOTO in BTS 449 for private copies of DLLs.
Additional changes to remove local DLL flag on uninstall and set privilege level.
 2007-06-18 15:21:02 -07:00
Edouard Gomez
dbf0694f1f Add a wrapper script for convert extension 2007-05-25 08:12:33 +02:00
Thomas Arendsen Hein
ae50302e53 Move convert-repo to hgext/convert/__init__.py 2007-06-06 19:49:47 +02:00
Patrick Mezard
fe805595f1 Merge with crew-stable 2007-06-04 22:56:42 +02:00
TK Soh
490bbff9dc hgk: display tags that contain spaces 2007-06-04 09:16:53 -05:00
Bela Babik
6a77eec575 hgk: added -selectbackground grey to canvases 2007-06-04 16:54:52 +10:00
Patrick Mezard
1391770d5b Merge with crew-stable. 2007-05-20 19:32:22 +02:00
Henri Precheur
0b652b63b3 Fix issue 563: error in _hg_commit in the contrib/zsh_completion script. 2007-05-20 19:27:14 +02:00
Daniel Holth
caa7c2ca50 use documented convert-repo interface 2007-05-16 01:10:12 -04:00
Daniel Holth
cb3cbd5fa8 document conversion interface 2007-05-16 01:07:27 -04:00
Bryan O'Sullivan
5313e5fea5 mq.el: add mq-signoff, to sign off on a patch 2007-05-08 11:54:39 -07:00
Bryan O'Sullivan
411ed17e0f mq.el: don't fill half the screen with a single line of output. 2007-05-08 11:54:39 -07:00
Bryan O'Sullivan
1baae2927b mq.el: add hook to run when finishing the edit of a patch. 2007-05-08 11:54:39 -07:00
Bryan O'Sullivan
164a276c57 imported patch mq-refresh-git.patch 2007-05-08 11:54:39 -07:00
Bryan O'Sullivan
a5fde1040c mq.el: allow mq-diff to take a git option. 2007-05-08 11:54:39 -07:00
Bryan O'Sullivan
a0bf3a7986 mq.el: add mq-diff function. 2007-05-08 11:54:39 -07:00
Bryan O'Sullivan
6de2e55e8c mq.el: add mq-edit-series function. 2007-05-08 11:54:39 -07:00
Bryan O'Sullivan
5b6367c912 mq.el: add mq-new function. 2007-05-08 11:54:39 -07:00
Bryan O'Sullivan
058a5fb7b0 contrib/hgsh: Check for .hg/store as well as .hg/data. 
This is required by the new repository layout.
 2007-05-08 11:51:25 -07:00
NIIMI Satoshi
1c67345a13 mercurial.el: fix error on hg-read-rev() with small tip, and cleanups 
* Fix error if tip revision is smaller than hg-rev-completion-limit

  If tip revision is 10, "hg log -r -100:tip" fails.

* Remove dependencies on cl package at runtime

  Quote from GNU Emacs Lisp Reference Manual, Emacs Lisp Coding Conventions:
  > * Please don't require the `cl' package of Common Lisp extensions at
  >   run time.  Use of this package is optional, and it is not part of
  >   the standard Emacs namespace.  If your package loads `cl' at run
  >   time, that could cause name clashes for users who don't use that
  >   package.

* Check XEmacs at compile time

  Since byte-compiled file is not portable between GNU Emacs and
  XEmacs, checking type of emacs can be done at compile time.  This
  reduces byte-compiler warnings.

* Defvar variables binded dynamically and used across functions

* Combine status output string to state symbol alist into a variable,
  and use char instead of string for key of state alist

* Make hg-view-mode as minor-mode

* Define keymaps as conventions
 2007-05-07 21:44:11 +09:00
Brendan Cully
6fae8c6b65 Fix test-patchbomb for crew 2007-05-08 13:08:20 -07:00
NIIMI Satoshi
30fab1e0c5 mercurial.el: don't raise an error from find-file-hook 
find-file() shouldn't fail even if unreadable .hg directory is exists.
Not enabling hg-mode is sufficient for that senario.
 2007-05-05 15:56:49 +09:00
NIIMI Satoshi
819c1ff3d3 mercurial.el: move defmacro of hg-do-across-repo before use 
Macros must be defined before use to be byte-compiled properly.
 2007-05-05 15:50:40 +09:00
Brendan Cully
15abedecdd Unconfuse font-lock 2007-05-07 08:42:48 -07:00
Patrick Mezard
2b6cc17dd7 simplemerge: flush stdout before writing to stderr. 
Besides, stderr is not always unbuffered under win32 (when redirections occur for instance), and it should be flushed too.
 2007-05-06 16:40:53 +02:00
Matt Mackall
5290628c48 Merge with stable 2007-05-03 17:27:21 -05:00
Lee Cantey
a02d3ae073 Update Windows build instructions. 2007-05-03 14:09:09 -07:00
Michael Gebetsroither
dd5ee4047c Add hgwebdir.fcgi to contrib 2007-04-29 18:17:35 -07:00
Lee Cantey
524f7a0cf1 Add notes about configuring a merge program 2007-04-26 23:58:18 -07:00
Lee Cantey
3fd9fb852e Update copyright year and change to range 2007-04-27 16:04:17 -07:00
Alexis S. L. Carvalho
2fe1ec9254 polish the simplemerge command; add a test 2007-04-16 20:17:39 -03:00
Alexis S. L. Carvalho
f65315991b actually port simplemerge to hg 
- use bdiff instead of patiencediff;  this is a larger change, since
  bdiff works on 2 multi-line strings, while patiencediff works on 2
  lists;

- rename the main class from Merge3 to Merge3Text and add a Merge3
  class that derives from Merge3Text.  This new Merge3 class has
  the same interface from the original class, so that the tests
  still work;

  - Merge3 uses util.binary to detect binary data and raises
    util.Abort instead of a specific exception;

- don't use the @decorator syntax, to keep python2.3 compatibility;

- the test uses unittest, which likes to print how long it took to
  run.  This obviously doesn't play too well with hg's test suite,
  so we override time.time to fool unittest;

- one test has a different (but still valid) output because of the
  different diff algorithm used;

- the TestCase class used by bzr has some extras to help debugging.
  test-merge3.py used 2 of them:

  - log method to log some data

  - assertEqualDiff method to ease viewing diffs of diffs

  We add a dummy log method and use regular assertEquals instead of
  assertEqualDiff.

- make simplemerge executable and add "#!/usr/bin/env python" header
 2007-04-16 20:17:39 -03:00
Alexis S. L. Carvalho
50315bfe3b Import 3-way merge code from bzr 
merge3.py is imported as contrib/simplemerge
test_merge3.py is imported as tests/test-simplemerge.py
 2007-04-16 20:17:39 -03:00
Joel Rosdahl
cd9e37bddc Add graphlog extension 2007-04-09 10:39:28 +02:00
Emanuele Aina
c4577db686 Move back the purge extension in hgext 2007-02-27 09:05:36 +01:00
Emanuele Aina
eb67de0025 purge: abort with missing files avoiding problems with name-mangling fs 
In a name mangling filesystem (e.g. a case insensitive one)
dirstate.walk() can yield filenames different from the ones
stored in the dirstate. This already confuses the status and
add commands, but with purge this may cause data loss.

To prevent this purge refuses to work if there are missing
files and has a 'force' option if the user knows it is safe.

Even with the force option purge checks if any of the missing
files is still available in the working dir: if so there
may be some problem with the underlying filesystem, so it
unconditionally aborts.
 2007-03-28 21:34:12 +02:00
julian@lava.net
a4f900945a mercurial.spec: add BuildRequires 
Add build dependencies from README as block quote.
 2007-01-21 00:59:23 -10:00
Adam Spiers
3aa5e87b5f mercurial.spec: fix when default python prefix != rpm %{_prefix} 
e.g. on SUSE Linux Enterprise 10
 2007-06-02 12:42:47 +01:00
Brendan Cully
d2aebd5874 hg-relink: do not compare .d files 2007-03-23 14:11:31 -07:00
Brendan Cully
294e96e41d Add hg-relink script to contrib 2007-03-19 09:36:06 -07:00
Alexis S. L. Carvalho
d879f85126 purge.py: fix invocation of statwalk 2007-03-06 17:45:50 -03:00
Emanuele Aina
5d9baefa2d Delete the README for purge, putting the useful informations in comments 2007-02-27 09:05:36 +01:00
Emanuele Aina
ee25137c54 Delete the Purge class, refactoring Purge.purge() in dopurge() 2007-03-06 17:45:47 -03:00
Emanuele Aina
9919c4cec9 Do not use 'self' in the purge() method 
Avoid any reference to 'self' in Purge.purge() to allow its refactoring
in a simple function.
 2007-03-06 17:45:46 -03:00
Emanuele Aina
444be74447 Use nested functions instead of object methods 2007-03-06 17:45:45 -03:00
Emanuele Aina
add604f550 Merge _remove_file() and _remove_dir() in a single function 2007-03-06 17:45:44 -03:00
Emanuele Aina
0784333e9d Use "f in dirstate" instead of "dirstate.state(f) == '?'" 2007-03-06 17:45:43 -03:00
Emanuele Aina
40ec111680 Reduce the absolute/relative path conversion in the purge extension 2007-03-06 17:45:41 -03:00
Emanuele Aina
0eba8ea662 Make the purge extension use the statwalk walker from the dirstate object 2007-03-06 17:45:40 -03:00
Emanuele Aina
7f4113f4c9 Use the mercurial i18n infrastructure in the purge extension 2007-02-27 09:05:36 +01:00
Emanuele Aina
253ba3cb60 Print relative names in the purge extension 2007-02-27 09:05:36 +01:00
Matt Mackall
fa7f84e558 Merge with crew 2007-02-26 12:12:29 -06:00
Matt Mackall
7389517c51 convert-repo: use .git/objects/ rather than .git/HEAD to detect git repos 2007-02-21 11:02:37 -06:00
Edouard Gomez
b5865c4bee Don't keep trailing white space in cvs tags 2007-02-21 00:38:06 +01:00
Edouard Gomez
3dca428e7f Change a bit cvsps arguments 
- Force updating the cache
- Use internal cvs implementation, reducing overhead
- Use quiet mode
 2007-02-21 00:38:06 +01:00
Daniel Holth
4d3ca846b4 convert-repo converts symlinks from git 2007-01-30 23:09:06 -05:00
Alexis S. L. Carvalho
7af591a53b convert-repo: handle packed git tags 2007-02-06 15:23:40 -02:00
csaba.henk@creo.hu
8af40de48e add pserver support to convert_repo 2007-01-27 15:53:31 -08:00
Matt Mackall
9a533e02cb symlinks: add flags param to wwrite 
Now wwrite can set symlink and exec for files
 2006-12-29 20:04:31 -06:00
Thomas Arendsen Hein
2cdb545f39 expanded bash_completion for transplant extension 2006-12-26 20:08:09 +01:00
Thomas Arendsen Hein
18cb6f7087 Yield entries from [paths], too, when completing -R/--repository. 2006-12-26 19:56:42 +01:00
Benoit Boissinot
cd66ae056f remove various unused import 2006-12-25 13:37:00 +01:00
Matt Mackall
8cff52fcff convert-repo: add option to attempt to sort by date 2006-12-22 17:59:40 -06:00
Matt Mackall
817a588598 convert-repo: add CVS exec bit support 2006-12-22 17:59:39 -06:00
Matt Mackall
75feb7bb1b convert-repo: add CVS branch support 2006-12-22 17:59:34 -06:00
Matt Mackall
ba8b6e6edb convert-repo: add basic CVS import support 2006-12-22 17:59:34 -06:00
Matt Mackall
a77f4328cc Merge with crew 2006-12-21 23:17:20 -06:00
Matt Mackall
09da67d940 Update convert-repo usage comments 2006-12-20 17:04:07 -06:00
Matt Mackall
deba2e1002 convert-repo: add some smarts 
autodetect source and destination repo types
autodetect read and write capabilities of converters
default destination directory (<src>-hg)
default map file (<dest>/.hg/shamap)
more verbose by default
add a -q switch

add IO functions
 2006-12-20 16:31:46 -06:00
Brendan Cully
bebaecb5c7 Merge with crew-stable 2006-12-20 12:05:12 -08:00
Thomas Arendsen Hein
bdd9bc9c2e sample.hgrc: hgk extension is now in hgext. Use churn as example for contrib. 2006-12-19 15:46:02 +01:00
Thomas Arendsen Hein
6cdaa1eb33 purge extension doesn't need "#!/usr/bin/env python". 
(from the Debian package: deb_specific__hgpurge.py.patch)
 2006-12-19 15:37:10 +01:00
Thomas Arendsen Hein
f2c2df1ab1 merge with crew-stable 2006-12-16 23:36:06 +01:00
Alexis S. L. Carvalho
437bbbf008 convert-repo: update usage information 2006-12-16 20:18:36 -02:00
Matt Mackall
5b91081b08 convert-repo: avoid adding bogus value to shamap on tag update 2006-12-16 14:41:34 -06:00
Matt Mackall
013499cdd5 convert-repo: fix recoding of committer 2006-12-16 14:35:14 -06:00
Andrei Vermel ext:(%22)
67fecf2874 hgk - fix CR issues on windows 2006-12-15 10:32:57 +03:00
Andrei Vermel ext:(%22)
bb3977beb8 hgk - fix CR issues on windows 2006-12-15 10:32:57 +03:00
Brendan Cully
19123a0330 Merge with main 2006-12-14 13:49:33 -08:00
Matt Mackall
f17a4e1934 Replace demandload with new demandimport 2006-12-13 13:27:09 -06:00
Steve Borho
8cbd4afec6 zsh: better fix for partial completions 
Properly handle relative paths followed by partial filenames
hg add ../path/to/file/partial[TAB]
 2006-12-12 15:34:11 -06:00
Matt Mackall
e138593173 Remove hard-coded version numbers and release notes from packaging 2006-12-10 17:41:07 -06:00
Matt Mackall
c5d95b8fdf Teach convert-repo to deal with mixed charsets in git 2006-12-07 18:03:28 -06:00