Mercurial > hg
annotate tests/test-check-code-hg.py @ 14050:9e8a9d45945c stable
subrepo: handle svn tracked/unknown directory collisions
This happens more often than expected. Say you have an svn subrepository with
python code. Python would have generated unknown .pyc files. Now, you rebase
this setup on a revision where a directory containing python code does not
exist. Subversion is first asked to remove this directory when updating, but
will not because it contains untracked items. Then it will have to bring back
the directory after the merge but will fail because it now collides with an
untracked directory.
Using --force is not very elegant and only works with svn >= 1.5 but the only
alternative I can think of is to write our own purge command for subversion.
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Fri, 04 Mar 2011 14:00:49 +0100 |
parents | b0e3d3973440 |
children |
rev | line source |
---|---|
11762
8b03c988efb3
tests: run check-code.py on working directory files
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
1 # Pass all working directory files through check-code.py |
8b03c988efb3
tests: run check-code.py on working directory files
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
2 |
8b03c988efb3
tests: run check-code.py on working directory files
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
3 import sys, os, imp |
8b03c988efb3
tests: run check-code.py on working directory files
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
4 rootdir = os.path.abspath(os.path.join(os.path.dirname(sys.argv[0]), '..')) |
8b03c988efb3
tests: run check-code.py on working directory files
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
5 if not os.path.isdir(os.path.join(rootdir, '.hg')): |
8b03c988efb3
tests: run check-code.py on working directory files
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
6 sys.stderr.write('skipped: cannot check code on non-repository sources\n') |
8b03c988efb3
tests: run check-code.py on working directory files
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
7 sys.exit(80) |
8b03c988efb3
tests: run check-code.py on working directory files
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
8 |
8b03c988efb3
tests: run check-code.py on working directory files
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
9 checkpath = os.path.join(rootdir, 'contrib/check-code.py') |
8b03c988efb3
tests: run check-code.py on working directory files
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
10 checkcode = imp.load_source('checkcode', checkpath) |
8b03c988efb3
tests: run check-code.py on working directory files
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
11 |
8b03c988efb3
tests: run check-code.py on working directory files
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
12 from mercurial import hg, ui |
8b03c988efb3
tests: run check-code.py on working directory files
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
13 u = ui.ui() |
8b03c988efb3
tests: run check-code.py on working directory files
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
14 repo = hg.repository(u, rootdir) |
8b03c988efb3
tests: run check-code.py on working directory files
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
15 checked = 0 |
11771
b0e3d3973440
tests: only run check-code on tracked files
Matt Mackall <mpm@selenic.com>
parents:
11762
diff
changeset
|
16 wctx = repo[None] |
b0e3d3973440
tests: only run check-code on tracked files
Matt Mackall <mpm@selenic.com>
parents:
11762
diff
changeset
|
17 for f in wctx: |
b0e3d3973440
tests: only run check-code on tracked files
Matt Mackall <mpm@selenic.com>
parents:
11762
diff
changeset
|
18 # ignore removed and unknown files |
b0e3d3973440
tests: only run check-code on tracked files
Matt Mackall <mpm@selenic.com>
parents:
11762
diff
changeset
|
19 if f not in wctx: |
b0e3d3973440
tests: only run check-code on tracked files
Matt Mackall <mpm@selenic.com>
parents:
11762
diff
changeset
|
20 continue |
11762
8b03c988efb3
tests: run check-code.py on working directory files
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
21 checked += 1 |
8b03c988efb3
tests: run check-code.py on working directory files
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
22 checkcode.checkfile(os.path.join(rootdir, f)) |
8b03c988efb3
tests: run check-code.py on working directory files
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
23 if not checked: |
8b03c988efb3
tests: run check-code.py on working directory files
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
24 sys.stderr.write('no file checked!\n') |