facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-08 07:49:11 +03:00
Code Issues Projects Releases Wiki Activity
1,810 Commits 24 Branches 62 Tags 322 MiB
8f15689d73
Commit Graph

1810 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vadim Gelfer
8f15689d73 hide some functions behind lambdas, so demandload is useful. 2006-02-28 07:24:54 -08:00
Vadim Gelfer
8fe551cfbe add extra newline to verbose log template. asak found this. 2006-02-27 21:37:57 -08:00
Vadim Gelfer
b00e030049 changeset_templater: only compute manifest when --debug. 2006-02-27 21:32:15 -08:00
Vadim Gelfer
9640cecf04 add doc comments to template code. 2006-02-27 15:07:25 -08:00
Vadim Gelfer
db8f1ef9b9 print tags in compact template. 2006-02-27 13:25:40 -08:00
Vadim Gelfer
b5016aab02 let commands that show changesets use templates. 
mechanism is same as hgweb templates.

old show_changeset code is still used for now if no template given,
because it is faster than template code when verbose or debug.

simple template can be given on command line using -t, --template.

example:

  hg log -t '{author|person}\n'

complex template can be put in template map file, given on command line
using --map-file.

we give two example map files:
map-log.compact prints 3 lines of output for every change.
map-log.verbose prints exact same output as default "hg log -v".

map files are searched where user says, then in template path as backup.

example:

  hg log --map-file map-log.compact

defaults can be set in hgrc with ui.logtemplate and ui.logmap.
 2006-02-27 13:18:57 -08:00
Vadim Gelfer
1a7e33442f add iso date template filter. 2006-02-27 12:50:49 -08:00
Vadim Gelfer
21aff25a2a improve template errors when something is wrong. 2006-02-27 12:41:20 -08:00
Vadim Gelfer
94422c87f2 improve templating. 
allow {foo} as well as #foo#.
add new functions for changeset authors.
 2006-02-27 11:33:09 -08:00
Vadim Gelfer
75d0535141 move shortuser into util module. 2006-02-27 11:32:10 -08:00
Vadim Gelfer
957bd7ed50 make parsestring work with strings that do not have quotes. 2006-02-27 11:18:56 -08:00
Vadim Gelfer
e8d01e14ea use safer string parser for template engine. 2006-02-27 09:35:43 -08:00
Vadim Gelfer
41badccf28 move repeated work out of inner loops. 2006-02-27 09:15:59 -08:00
Vadim Gelfer
9f0cbe341c many small changes to templater. 
get string code to parse escapes. uses eval now, should parse strings
itself soon.

let caller check if fragment is defined using "in".

make templatepath take optional file name.
 2006-02-26 20:53:37 -08:00
Vadim Gelfer
088b436796 missed hunk when moving code to templater module 2006-02-26 13:11:53 -08:00
Vadim Gelfer
1db1ed4f1f move hgweb.templatepath into templater 2006-02-26 13:09:26 -08:00
Vadim Gelfer
5b07616ef3 move hgweb template code out to templater 2006-02-26 12:59:28 -08:00
Thomas Arendsen Hein
cc4cb4f573 Removed now obsolete min/max check in walkchangerevs(). 2006-02-23 22:47:40 +01:00
Thomas Arendsen Hein
ad26220685 Replaced fixed window size for walkchangerevs with an increasing one. Window 
sizes starts at 8 (for good interactiveness) and doubles with each window
until it is 512, which seems to be the maximum efficient value.
 2006-02-23 22:37:29 +01:00
Radoslaw Szkodzinski
f317122c08 hgmerge: do not use file with markers in tools merging themselves 
This time I forgot about a crucial part of the logic change.
The patch makes kdiff3 and tkdiff useful again.
 2006-02-23 18:10:04 +01:00
Thomas Arendsen Hein
061017fafb Fix hgmerge: mkdir "'/tmp'/hgmerge..." and ask_if_merged() didn't work. 2006-02-23 14:42:47 +01:00
Thomas Arendsen Hein
b21808e452 Fixed wrong (copy&paste) usage of tmpl instead of self.t in hgweb. 2006-02-23 12:35:15 +01:00
Lee Cantey
da24f36b2f Fix 'hg serve' not using CSS. 
hgweb.py (templatepath): Return normalized path [fixes later checks in staticfile()]
 2006-02-23 12:02:39 +01:00
Benoit Boissinot
b04984b4a2 only write the dirstate when something changed 2006-02-23 02:17:08 +01:00
Thomas Arendsen Hein
73505880b7 Allow serving static files from hgwebdir to fix CSS and favicon. 2006-02-22 09:14:46 +01:00
Thomas Arendsen Hein
43a294292a Cleanup of tabs and coding when sending content type. 2006-02-22 08:32:51 +01:00
Thomas Arendsen Hein
d01238bb12 Merge with jeffpc's hg-static 2006-02-22 08:11:52 +01:00
Thomas Arendsen Hein
6e950588da Merge with mercurial/tonfa 2006-02-22 08:04:46 +01:00
Thomas Arendsen Hein
9440d1331a Don't use mktemp in tests, we're already in a secure temp dir. 2006-02-22 07:51:32 +01:00
Thomas Arendsen Hein
5b2af56e00 Added test cases for repo corruption fixed in e2b47039575f (issue132) 
(submitted by Alexis S. L. Carvalho <alexis@cecm.usp.br>)
 2006-02-22 07:45:14 +01:00
Benoit Boissinot
75ed459311 revalidate revlog data after locking the repo (issue132) 2006-02-22 07:26:29 +01:00
Josef "Jeff" Sipek
50ccddca40 [hgweb] Added favicon to standard/gitweb templates 2006-02-22 01:06:17 -05:00
Benoit Boissinot
3f8a6eafb6 merge with matt 2006-02-22 05:21:09 +01:00
Matt Mackall
a318b34fa1 Merge with jeffpc 2006-02-21 17:36:27 -06:00
Benoit Boissinot
1a125a9178 change the default timeout to 600 seconds 2006-02-21 23:50:53 +01:00
Benoit Boissinot
25acc6be22 add a timeout when a lock is held (default 1024 sec) 
- change the wait keyword from lock.lock to timeout,
  a negative timeout of means "wait forever"
- refactor the two lock functions from localrepo.py
- make them use the timeout (default 1024, can be changed
  with ui.timeout in the config file
- update the doc
 2006-02-21 23:21:15 +01:00
Matt Mackall
6597c90b82 Merge with crew 2006-02-21 15:48:49 -06:00
Radoslaw Szkodzinski
c629a66a79 hgmerge: add meld support 2006-02-21 15:48:22 -06:00
Radoslaw Szkodzinski
2321c457be hgmerge: improve "apps not found" message 2006-02-21 15:48:19 -06:00
Radoslaw Szkodzinski
2bb2a3d01e hgmerge: logic changes 
Details:
  - keep automatic merge conflicts in $LOCAL
  - do not assume that $EDITOR returns proper error code
  - fix a slight mistake in diff+patch merge success detection
    (it could succeed if the $EDITOR failed to run)
 2006-02-21 15:48:16 -06:00
Radoslaw Szkodzinski
cb8c24f147 hgmerge: add and use ask_if_merged function 
This patch, unlike the earlier ones, doesn't use unportable select builtin.
 2006-02-21 15:48:12 -06:00
Radoslaw Szkodzinski
be682ca909 hgmerge: fix diff+patch detection; cleanups 
Details:
  - actually show help message when no tools are found
  - whitespace cleanup (stupid emacs)
  - quote more variables
  - simplify merge/diff3 error handling
 2006-02-21 15:48:09 -06:00
Benoit Boissinot
3e01c63336 merge with crew 2006-02-21 16:46:38 +01:00
Thomas Arendsen Hein
07effec89b Merged RSS feed for tags from Peter van Dijk 2006-02-21 16:04:47 +01:00
Thomas Arendsen Hein
afb829966a hg log --limit shouldn't count unprinted revisions (found by TK Soh) 2006-02-21 15:54:50 +01:00
Thomas Arendsen Hein
9c553aca17 Cleanup: Put initialization of br in front of --branches option handling. 2006-02-21 15:37:23 +01:00
Thomas Arendsen Hein
715ff402e3 Make option --branch vs. --branches more consistent. 
As you can abbreviate --branches to --branch, old scripts using the long
name will still work.
 2006-02-21 13:14:03 +01:00
Thomas Arendsen Hein
18551d6c25 Add option -b/--branch to hg tip (as done for hg parents). 2006-02-21 12:59:16 +01:00
Benoit Boissinot
0cbef7be6f merge with crew 2006-02-21 08:11:46 +01:00
Benoit Boissinot
c29de9e40e fix typo in debugrebuildstate 2006-02-21 00:45:02 +01:00