Mercurial > hg > mercurial-crew-with-dirclash
changeset 1308:2073e5a71008
Cleanup of tabs and trailing spaces.
| author | Thomas Arendsen Hein <thomas@intevation.de> |
|---|---|
| date | Wed, 21 Sep 2005 07:56:19 +0200 |
| parents | 1546c2aa6b30 |
| children | 332f225b835c |
| files | README comparison.txt contrib/bash_completion contrib/hgk contrib/hgk.py contrib/mercurial.el contrib/tcsh_completion contrib/tcsh_completion_build.sh doc/hg.1.txt doc/hgrc.5.txt mercurial/hgweb.py mercurial/packagescan.py mercurial/util.py notes.txt setup.py templates/header.tmpl tests/run-tests tests/test-rawcommit1 tests/test-tag tests/test-unrelated-pull tests/test-update-reverse |
| diffstat | 21 files changed, 48 insertions(+), 48 deletions(-) [+] |
line wrap: on
line diff
--- a/README +++ b/README @@ -63,7 +63,7 @@ Importing patches: $ hg commit `lsdiff -p1 ../p/foo.patch` Fastest: - $ cat ../p/patchlist | xargs hg import -p1 -b ../p + $ cat ../p/patchlist | xargs hg import -p1 -b ../p Exporting a patch: @@ -76,12 +76,12 @@ Exporting a patch: Network support: # pull from the primary Mercurial repo - foo$ hg clone http://selenic.com/hg/ + foo$ hg clone http://selenic.com/hg/ foo$ cd hg # export your current repo via HTTP with browsable interface foo$ hg serve -n "My repo" -p 80 - + # pushing changes to a remote repo with SSH foo$ hg push ssh://user@example.com/~/hg/
--- a/comparison.txt +++ b/comparison.txt @@ -3,7 +3,7 @@ storage revlog delta compr storage naming by filename by revision hash by filename merge file DAGs changeset DAG file DAGs? consistency SHA1 SHA1 CRC -signable? yes yes no +signable? yes yes no retrieve file tip O(1) O(1) O(revs) add rev O(1) O(1) O(revs)
--- a/contrib/bash_completion +++ b/contrib/bash_completion @@ -3,10 +3,10 @@ _hg_commands() { local commands="$(hg -v help | sed -e '1,/^list of commands:/d' \ - -e '/^global options:/,$d' \ + -e '/^global options:/,$d' \ -e '/^ [^ ]/!d; s/[,:]//g;')" - - # hide debug commands from users, but complete them if + + # hide debug commands from users, but complete them if # specifically asked for if [[ "$cur" == de* ]]; then commands="$commands debugcheckstate debugstate debugindex" @@ -62,7 +62,7 @@ cur="$2" prev="$3" - # searching for the command + # searching for the command # (first non-option argument that doesn't follow a global option that # receives an argument) for (( i=1; $i<=$COMP_CWORD; i++ )); do @@ -160,7 +160,7 @@ COMPREPLY=(${COMPREPLY[@]:-} $( compgen -f -- "$cur" )) fi ;; - *) + *) COMPREPLY=(${COMPREPLY[@]:-} $( compgen -f -- "$cur" )) ;; esac
--- a/contrib/hgk +++ b/contrib/hgk @@ -2113,7 +2113,7 @@ proc selectline {l isnew} { } $ctext insert end "\n" } - + set comment {} if {[info exists parents($id)]} { foreach p $parents($id) {
--- a/contrib/hgk.py +++ b/contrib/hgk.py @@ -86,7 +86,7 @@ def difftree(ui, repo, node1=None, node2 for f in c: # TODO get file permissions - print ":100664 100664 %s %s M\t%s\t%s" % (hg.hex(mmap[f]), + print ":100664 100664 %s %s M\t%s\t%s" % (hg.hex(mmap[f]), hg.hex(mmap2[f]), f, f) for f in a: print ":000000 100664 %s %s N\t%s\t%s" % (empty, hg.hex(mmap2[f]), f, f) @@ -137,7 +137,7 @@ def catcommit(repo, n, prefix, changes=N committer = lines[-1].split(': ')[1].rstrip() else: committer = "%s %s %s" % (changes[1], date, date_ar[1]) - + print "author %s %s %s" % (changes[1], date, date_ar[1]) print "committer %s" % (committer) print "" @@ -220,7 +220,7 @@ def revtree(args, repo, full="tree", max yield (i + x, full != None and l[x] or None) if i == 0: break - + # calculate and return the reachability bitmask for sha def is_reachable(ar, reachable, sha): if len(ar) == 0:
--- a/contrib/mercurial.el +++ b/contrib/mercurial.el @@ -262,7 +262,7 @@ repository-related commands." 'hg-commit-mouse-clicked) (define-key hg-commit-mode-file-map " " 'hg-commit-toggle-file) (define-key hg-commit-mode-file-map "\r" 'hg-commit-toggle-file) - + ;;; Convenience functions. @@ -327,7 +327,7 @@ all buffers visiting files in the reposi (vc-buffer-sync)) (hg-do-across-repo path (vc-buffer-sync))))) - + (defun hg-buffer-commands (pnt) "Use the properties of a character to do something sensible." (interactive "d") @@ -402,7 +402,7 @@ Each key is of the form (section . name) (key (split-string left "\\.")) (value (hg-replace-in-string right "\\\\n" "\n" t))) (setq items (cons (cons (cons (car key) (cadr key)) value) items)))))) - + (defun hg-config-section (section config) "Return an alist of (name . value) pairs for SECTION of CONFIG." (let (items) @@ -522,7 +522,7 @@ current frame." (when file-name (set (make-local-variable 'hg-view-file-name) (hg-abbrev-file-name file-name)))) - + (defun hg-file-status (file) "Return status of FILE, or nil if FILE does not exist or is unmanaged." (let* ((s (hg-run "status" file)) @@ -591,7 +591,7 @@ to have moved a little, but not really c (mark-context (let ((mark (mark-marker))) (and mark (hg-position-context mark))))) (list point-context mark-context))) - + (defun hg-find-context (ctx) "Attempt to find a context in the given buffer. Always returns a valid, hopefully sane, position." @@ -740,7 +740,7 @@ With a prefix argument, prompt for the p (add-text-properties bol (point) '(face bold)) (message "%s will be committed" (buffer-substring bol (point))))))) - + (defun hg-commit-mouse-clicked (event) "Toggle whether or not the file at POS will be committed." (interactive "@e") @@ -927,7 +927,7 @@ With a prefix argument, prompt for the p (when update (with-current-buffer buf (hg-mode-line))))) - + (defun hg-incoming (&optional repo) "Display changesets present in REPO that are not present locally." (interactive (list (hg-read-repo-name " where changes would come from")))
--- a/contrib/tcsh_completion +++ b/contrib/tcsh_completion @@ -2,14 +2,14 @@ # tcsh completion for Mercurial # # This file has been auto-generated by tcsh_completion_build.sh for -# Mercurial Distributed SCM (version 325c07fd2ebd) +# Mercurial Distributed SCM (version 325c07fd2ebd) # # Copyright (C) 2005 TK Soh. # # This is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free # Software Foundation; either version 2 of the License, or (at your -# option) any later version. +# option) any later version. # complete hg \
--- a/contrib/tcsh_completion_build.sh +++ b/contrib/tcsh_completion_build.sh @@ -9,7 +9,7 @@ # This is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free # Software Foundation; either version 2 of the License, or (at your -# option) any later version. +# option) any later version. # # # Description @@ -55,14 +55,14 @@ cat > $tcsh_file <<END # tcsh completion for Mercurial # # This file has been auto-generated by $script_name for -# $hg_version +# $hg_version # # Copyright (C) 2005 TK Soh. # # This is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free # Software Foundation; either version 2 of the License, or (at your -# option) any later version. +# option) any later version. # complete hg \\
--- a/doc/hg.1.txt +++ b/doc/hg.1.txt @@ -202,7 +202,7 @@ copy <source ...> <dest>:: -X, --exclude <pat> exclude names matching the given patterns -f, --force forcibly copy over an existing managed file -p, --parents append source path to dest - + aliases: cp diff [-a] [-r revision] [-r revision] [files ...]::
--- a/doc/hgrc.5.txt +++ b/doc/hgrc.5.txt @@ -61,7 +61,7 @@ This section describes the different sec Mercurial "hgrc" file, the purpose of each section, its possible keys, and their possible values. -decode/encode:: +decode/encode:: Filters for transforming files on checkout/checkin. This would typically be used for newline processing or other localization/canonicalization of files.
--- a/mercurial/hgweb.py +++ b/mercurial/hgweb.py @@ -685,7 +685,7 @@ class hgweb: encoding = "gzip" else: encoding = "x-bzip2" - req.header([('Content-type', 'application/x-tar'), + req.header([('Content-type', 'application/x-tar'), ('Content-disposition', 'attachment; filename=%s%s%s' % (name[:-1], '.tar.', type)), ('Content-encoding', encoding)])
--- a/mercurial/packagescan.py +++ b/mercurial/packagescan.py @@ -1,4 +1,4 @@ -# packagescan.py - Helper module for identifing used modules. +# packagescan.py - Helper module for identifing used modules. # Used for the py2exe distutil. # # Copyright 2005 Volker Kleinfeld <Volker.Kleinfeld@gmx.de> @@ -26,9 +26,9 @@ def getmodules(libpath,packagename): libpath = os.path.abspath(libpath) sys.path.insert(0,libpath) packdir = os.path.join(libpath,packagename) - # A normal import would not find the package in + # A normal import would not find the package in # the build directory. ihook is used to force the import. - # After the package is imported the import scope for + # After the package is imported the import scope for # the following imports is settled. p = importfrom(packdir) globals()[packagename] = p @@ -46,7 +46,7 @@ def getmodules(libpath,packagename): if m == '__init__.py': continue tmp = {} mname,ext = os.path.splitext(m) - fullname = packagename+'.'+mname + fullname = packagename+'.'+mname __import__(fullname,tmp,tmp) requiredmodules[fullname] = 1 # Import all extension modules and by that run the fake demandload
--- a/mercurial/util.py +++ b/mercurial/util.py @@ -45,7 +45,7 @@ def patch(strip, patchname, ui): if code: raise Abort("patch command failed: exit status %s " % code) return files.keys() - + def binary(s): """return true if a string is binary data using diff's heuristic""" if s and '\0' in s[:4096]: @@ -470,7 +470,7 @@ class chunkbuffer(object): def read(self, l): """Read L bytes of data from the iterator of chunks of data. - Returns less than L bytes if the iterator runs dry.""" + Returns less than L bytes if the iterator runs dry.""" if l > len(self.buf) and not self.iterempty: # Clamp to a multiple of self.targetsize targetsize = self.targetsize * ((l // self.targetsize) + 1)
--- a/notes.txt +++ b/notes.txt @@ -91,7 +91,7 @@ need to be added, deleted, and merged. Then for each file, we perform a graph merge and resolve as above. It's important to merge files using per-file DAGs rather than just -changeset level DAGs as this diagram illustrates: +changeset level DAGs as this diagram illustrates: M M1 M2
--- a/setup.py +++ b/setup.py @@ -13,13 +13,13 @@ import mercurial.version # py2exe needs to be installed to work try: - import py2exe + import py2exe # Due to the use of demandload py2exe is not finding the modules. - # packagescan.getmodules creates a list of modules included in + # packagescan.getmodules creates a list of modules included in # the mercurial package plus depdent modules. - import mercurial.packagescan - from py2exe.build_exe import py2exe as build_exe + import mercurial.packagescan + from py2exe.build_exe import py2exe as build_exe class py2exe_for_demandload(build_exe): """ overwrites the py2exe command class for getting the build
--- a/templates/header.tmpl +++ b/templates/header.tmpl @@ -23,7 +23,7 @@ a { text-decoration:none; } .metatag { background-color: #888888; color: white; - text-align: right; + text-align: right; } /* Common */
--- a/tests/run-tests +++ b/tests/run-tests @@ -104,14 +104,14 @@ run_one() { return $fail } -# list of prerequisite programs +# list of prerequisite programs # stuff from coreutils (cat, rm, etc) are not tested prereqs="python merge diff grep unzip md5sum gunzip sed" missing='' for pre in $prereqs ; do if type $pre > /dev/null 2>&1 ; then : prereq exists - else + else missing="$pre $missing" fi done
--- a/tests/test-rawcommit1 +++ b/tests/test-rawcommit1 @@ -2,10 +2,10 @@ hg --debug init echo this is a1 > a hg add a -hg commit -m0 -d "0 0" +hg commit -m0 -d "0 0" echo this is b1 > b hg add b -hg commit -m1 -d "0 0" +hg commit -m1 -d "0 0" hg manifest 1 echo this is c1 > c hg rawcommit -p 1 -d "0 0" -m2 c
--- a/tests/test-tag +++ b/tests/test-tag @@ -5,9 +5,9 @@ echo a > a hg add a hg commit -m "test" -d "0 0" hg history -hg tag -d "0 0" "bleah" +hg tag -d "0 0" "bleah" hg history echo foo >> .hgtags -hg tag -d "0 0" "bleah2" || echo "failed" +hg tag -d "0 0" "bleah2" || echo "failed"