Mercurial > hg > hq
annotate hq/main.py @ 9:0d741a309fdb
add a directory command
| author | Jeff Hammel <jhammel@mozilla.com> |
|---|---|
| date | Tue, 12 Mar 2013 14:06:29 -0700 |
| parents | d1aa54a8fd89 |
| children | 5ea675cfecd9 |
| rev | line source |
|---|---|
| 0 | 1 #!/usr/bin/env python |
|
7
2e77fc6a36e8
add a status command; so much shit to clean
Jeff Hammel <jhammel@mozilla.com>
parents:
6
diff
changeset
|
2 |
| 0 | 3 """ |
| 4 mercurial queue extension front-end policy manager | |
| 5 """ | |
| 6 | |
|
7
2e77fc6a36e8
add a status command; so much shit to clean
Jeff Hammel <jhammel@mozilla.com>
parents:
6
diff
changeset
|
7 # TODO: migrate to http://k0s.org/hg/CommandParser/ |
|
2e77fc6a36e8
add a status command; so much shit to clean
Jeff Hammel <jhammel@mozilla.com>
parents:
6
diff
changeset
|
8 |
| 0 | 9 import os |
| 10 import subprocess | |
| 11 import sys | |
| 12 | |
| 13 from command import CommandParser | |
| 14 | |
|
7
2e77fc6a36e8
add a status command; so much shit to clean
Jeff Hammel <jhammel@mozilla.com>
parents:
6
diff
changeset
|
15 call = subprocess.check_output |
| 0 | 16 |
| 17 class HQ(object): | |
| 18 """ | |
| 19 mercurial queue extension front-end policy manager | |
| 20 """ | |
| 21 | |
|
7
2e77fc6a36e8
add a status command; so much shit to clean
Jeff Hammel <jhammel@mozilla.com>
parents:
6
diff
changeset
|
22 def __init__(self, queue_host=None, network=True, root=None, binary='hg'): |
| 0 | 23 """initialize global options""" |
| 24 # TODO: look at hgrc file | |
| 1 | 25 # for [defaults] repository_host |
|
5
448c248b3738
start the path to using the __init__ function for realz
Jeff Hammel <jhammel@mozilla.com>
parents:
4
diff
changeset
|
26 # XXX ??? |
|
448c248b3738
start the path to using the __init__ function for realz
Jeff Hammel <jhammel@mozilla.com>
parents:
4
diff
changeset
|
27 |
|
448c248b3738
start the path to using the __init__ function for realz
Jeff Hammel <jhammel@mozilla.com>
parents:
4
diff
changeset
|
28 # check for network |
|
448c248b3738
start the path to using the __init__ function for realz
Jeff Hammel <jhammel@mozilla.com>
parents:
4
diff
changeset
|
29 self.network = network |
|
448c248b3738
start the path to using the __init__ function for realz
Jeff Hammel <jhammel@mozilla.com>
parents:
4
diff
changeset
|
30 |
|
448c248b3738
start the path to using the __init__ function for realz
Jeff Hammel <jhammel@mozilla.com>
parents:
4
diff
changeset
|
31 self.queue_host = queue_host |
| 0 | 32 |
|
7
2e77fc6a36e8
add a status command; so much shit to clean
Jeff Hammel <jhammel@mozilla.com>
parents:
6
diff
changeset
|
33 if root is None: |
|
2e77fc6a36e8
add a status command; so much shit to clean
Jeff Hammel <jhammel@mozilla.com>
parents:
6
diff
changeset
|
34 root = call(['hg', 'root']).strip() |
|
2e77fc6a36e8
add a status command; so much shit to clean
Jeff Hammel <jhammel@mozilla.com>
parents:
6
diff
changeset
|
35 self.root = root |
|
2e77fc6a36e8
add a status command; so much shit to clean
Jeff Hammel <jhammel@mozilla.com>
parents:
6
diff
changeset
|
36 |
|
2e77fc6a36e8
add a status command; so much shit to clean
Jeff Hammel <jhammel@mozilla.com>
parents:
6
diff
changeset
|
37 self.binary = binary |
|
2e77fc6a36e8
add a status command; so much shit to clean
Jeff Hammel <jhammel@mozilla.com>
parents:
6
diff
changeset
|
38 |
|
2e77fc6a36e8
add a status command; so much shit to clean
Jeff Hammel <jhammel@mozilla.com>
parents:
6
diff
changeset
|
39 ### subcommands |
|
2e77fc6a36e8
add a status command; so much shit to clean
Jeff Hammel <jhammel@mozilla.com>
parents:
6
diff
changeset
|
40 |
| 3 | 41 def clone(self, repo, patch=None, queue=None): |
| 42 """ | |
| 43 clone the repository and begin a patch queue | |
| 44 - path: name of a new patch to initiate | |
| 45 - queue: name of the remote queue | |
| 46 """ | |
| 0 | 47 directory = repo.rsplit('/', 1) |
| 48 call(['hg', 'clone', repo, directory]) | |
| 49 os.chdir(directory) | |
| 50 call(['hg', 'qinit', '-c']) | |
| 3 | 51 if queue: |
|
4
44ea39c3e98f
add methods for dealing with the patch repositories
Jeff Hammel <jhammel@mozilla.com>
parents:
3
diff
changeset
|
52 # pull from the given repository |
|
44ea39c3e98f
add methods for dealing with the patch repositories
Jeff Hammel <jhammel@mozilla.com>
parents:
3
diff
changeset
|
53 self._patch_command(*['hg', 'pull', '--update', queue]) |
|
44ea39c3e98f
add methods for dealing with the patch repositories
Jeff Hammel <jhammel@mozilla.com>
parents:
3
diff
changeset
|
54 else: |
|
44ea39c3e98f
add methods for dealing with the patch repositories
Jeff Hammel <jhammel@mozilla.com>
parents:
3
diff
changeset
|
55 # (optionally) setup a new repo |
|
44ea39c3e98f
add methods for dealing with the patch repositories
Jeff Hammel <jhammel@mozilla.com>
parents:
3
diff
changeset
|
56 pass # TODO |
|
7
2e77fc6a36e8
add a status command; so much shit to clean
Jeff Hammel <jhammel@mozilla.com>
parents:
6
diff
changeset
|
57 |
| 0 | 58 if patch: |
|
4
44ea39c3e98f
add methods for dealing with the patch repositories
Jeff Hammel <jhammel@mozilla.com>
parents:
3
diff
changeset
|
59 # create a new patch |
| 0 | 60 call(['hg', 'qnew', patch]) |
| 61 | |
| 62 def commit(self, message): | |
| 63 """ | |
| 64 commit a patch and push it to the master repository | |
|
5
448c248b3738
start the path to using the __init__ function for realz
Jeff Hammel <jhammel@mozilla.com>
parents:
4
diff
changeset
|
65 - message : commit message |
| 0 | 66 """ |
| 67 call(['hg', 'qrefresh']) | |
| 68 call(['hg', 'qcommit', '-m', message]) | |
|
5
448c248b3738
start the path to using the __init__ function for realz
Jeff Hammel <jhammel@mozilla.com>
parents:
4
diff
changeset
|
69 if self.network: |
|
448c248b3738
start the path to using the __init__ function for realz
Jeff Hammel <jhammel@mozilla.com>
parents:
4
diff
changeset
|
70 self._patch_command(*['hg', 'push']) |
| 0 | 71 |
| 72 def pull(self, repo=None): | |
| 73 """ | |
| 74 pull from the root repository | |
| 75 """ | |
| 76 # TODO: commit prior to realignment | |
| 77 call(['hg', 'qpop', '--all']) | |
| 78 call(['hg', 'pull'] + repo and [repo] or []) | |
| 79 call(['hg', 'qpush', '--all']) | |
|
2
dedf4c4c2ba2
add a function to list files (incomplete)
Jeff Hammel <jhammel@mozilla.com>
parents:
1
diff
changeset
|
80 |
| 3 | 81 def goto(self, patch): |
| 82 """ | |
|
5
448c248b3738
start the path to using the __init__ function for realz
Jeff Hammel <jhammel@mozilla.com>
parents:
4
diff
changeset
|
83 go to a specific patch and apply it |
|
448c248b3738
start the path to using the __init__ function for realz
Jeff Hammel <jhammel@mozilla.com>
parents:
4
diff
changeset
|
84 - patch: name of patch to go to |
| 3 | 85 """ |
| 86 # TODO | |
| 87 process = subprocess.Popen(['hg', 'qapplied'], stdout=subprocess.PIPE) | |
| 88 stdout, stderr = process.communicate() | |
| 89 applied = [ i.strip() for i in stdout.splitlines() | |
| 90 if i ] | |
| 91 raise NotImplementedError | |
| 92 | |
|
2
dedf4c4c2ba2
add a function to list files (incomplete)
Jeff Hammel <jhammel@mozilla.com>
parents:
1
diff
changeset
|
93 def files(self): |
|
dedf4c4c2ba2
add a function to list files (incomplete)
Jeff Hammel <jhammel@mozilla.com>
parents:
1
diff
changeset
|
94 """ |
|
dedf4c4c2ba2
add a function to list files (incomplete)
Jeff Hammel <jhammel@mozilla.com>
parents:
1
diff
changeset
|
95 list the files added by the top patch |
|
dedf4c4c2ba2
add a function to list files (incomplete)
Jeff Hammel <jhammel@mozilla.com>
parents:
1
diff
changeset
|
96 """ |
|
dedf4c4c2ba2
add a function to list files (incomplete)
Jeff Hammel <jhammel@mozilla.com>
parents:
1
diff
changeset
|
97 # TODO: should only list top-level directories, otherwise it's silly |
|
dedf4c4c2ba2
add a function to list files (incomplete)
Jeff Hammel <jhammel@mozilla.com>
parents:
1
diff
changeset
|
98 _oldcwd = os.getcwd() |
|
dedf4c4c2ba2
add a function to list files (incomplete)
Jeff Hammel <jhammel@mozilla.com>
parents:
1
diff
changeset
|
99 process = subprocess.Popen("hg qdiff | grep '^+++ ' | sed 's/+++ b\///'", stdout=subprocess.PIPE) |
|
dedf4c4c2ba2
add a function to list files (incomplete)
Jeff Hammel <jhammel@mozilla.com>
parents:
1
diff
changeset
|
100 stdout, stderr = process.communicate() |
|
dedf4c4c2ba2
add a function to list files (incomplete)
Jeff Hammel <jhammel@mozilla.com>
parents:
1
diff
changeset
|
101 return stdout |
|
dedf4c4c2ba2
add a function to list files (incomplete)
Jeff Hammel <jhammel@mozilla.com>
parents:
1
diff
changeset
|
102 |
|
7
2e77fc6a36e8
add a status command; so much shit to clean
Jeff Hammel <jhammel@mozilla.com>
parents:
6
diff
changeset
|
103 def status(self): |
|
2e77fc6a36e8
add a status command; so much shit to clean
Jeff Hammel <jhammel@mozilla.com>
parents:
6
diff
changeset
|
104 """ |
|
2e77fc6a36e8
add a status command; so much shit to clean
Jeff Hammel <jhammel@mozilla.com>
parents:
6
diff
changeset
|
105 display status |
|
2e77fc6a36e8
add a status command; so much shit to clean
Jeff Hammel <jhammel@mozilla.com>
parents:
6
diff
changeset
|
106 """ |
|
2e77fc6a36e8
add a status command; so much shit to clean
Jeff Hammel <jhammel@mozilla.com>
parents:
6
diff
changeset
|
107 |
|
2e77fc6a36e8
add a status command; so much shit to clean
Jeff Hammel <jhammel@mozilla.com>
parents:
6
diff
changeset
|
108 # TODO: once this is on CommandParser, there should be a utility in |
|
2e77fc6a36e8
add a status command; so much shit to clean
Jeff Hammel <jhammel@mozilla.com>
parents:
6
diff
changeset
|
109 # command parser to allow aliases; e.g. if you do ``st = status`` at |
|
2e77fc6a36e8
add a status command; so much shit to clean
Jeff Hammel <jhammel@mozilla.com>
parents:
6
diff
changeset
|
110 # the class scope, you can run through the methods and only display |
|
2e77fc6a36e8
add a status command; so much shit to clean
Jeff Hammel <jhammel@mozilla.com>
parents:
6
diff
changeset
|
111 # one as canon but allow aliases as such. |
|
2e77fc6a36e8
add a status command; so much shit to clean
Jeff Hammel <jhammel@mozilla.com>
parents:
6
diff
changeset
|
112 # Alternatively, you can allow any short non-ambiguous abbreviation. |
|
2e77fc6a36e8
add a status command; so much shit to clean
Jeff Hammel <jhammel@mozilla.com>
parents:
6
diff
changeset
|
113 |
| 8 | 114 return '\n'.join([self._call(i).strip() for i in ('root', 'status', 'qseries')]) |
|
7
2e77fc6a36e8
add a status command; so much shit to clean
Jeff Hammel <jhammel@mozilla.com>
parents:
6
diff
changeset
|
115 |
| 9 | 116 def directory(self): |
| 117 """ | |
| 118 patch queue directory | |
| 119 """ | |
| 120 patch_dir = os.path.join(self.root, '.hg', 'patches') | |
| 121 return patch_dir if os.path.isdir(patch_dir) else None | |
| 122 | |
|
7
2e77fc6a36e8
add a status command; so much shit to clean
Jeff Hammel <jhammel@mozilla.com>
parents:
6
diff
changeset
|
123 ### internals |
|
2e77fc6a36e8
add a status command; so much shit to clean
Jeff Hammel <jhammel@mozilla.com>
parents:
6
diff
changeset
|
124 |
|
2e77fc6a36e8
add a status command; so much shit to clean
Jeff Hammel <jhammel@mozilla.com>
parents:
6
diff
changeset
|
125 def _call(self, *args): |
|
2e77fc6a36e8
add a status command; so much shit to clean
Jeff Hammel <jhammel@mozilla.com>
parents:
6
diff
changeset
|
126 command = [self.binary] + list(args) |
|
2e77fc6a36e8
add a status command; so much shit to clean
Jeff Hammel <jhammel@mozilla.com>
parents:
6
diff
changeset
|
127 return call(command, cwd=self.root) |
|
2e77fc6a36e8
add a status command; so much shit to clean
Jeff Hammel <jhammel@mozilla.com>
parents:
6
diff
changeset
|
128 |
|
4
44ea39c3e98f
add methods for dealing with the patch repositories
Jeff Hammel <jhammel@mozilla.com>
parents:
3
diff
changeset
|
129 def _patch_repo(self): |
|
44ea39c3e98f
add methods for dealing with the patch repositories
Jeff Hammel <jhammel@mozilla.com>
parents:
3
diff
changeset
|
130 """the location of the patch repository""" |
|
44ea39c3e98f
add methods for dealing with the patch repositories
Jeff Hammel <jhammel@mozilla.com>
parents:
3
diff
changeset
|
131 root = subprocess.Popen(['hg', 'root'], stdout=subprocess.PIPE).communicate()[0] |
|
44ea39c3e98f
add methods for dealing with the patch repositories
Jeff Hammel <jhammel@mozilla.com>
parents:
3
diff
changeset
|
132 return os.path.join(root, '.hg', 'patches') |
|
44ea39c3e98f
add methods for dealing with the patch repositories
Jeff Hammel <jhammel@mozilla.com>
parents:
3
diff
changeset
|
133 |
|
44ea39c3e98f
add methods for dealing with the patch repositories
Jeff Hammel <jhammel@mozilla.com>
parents:
3
diff
changeset
|
134 def _patch_command(self, *command): |
|
44ea39c3e98f
add methods for dealing with the patch repositories
Jeff Hammel <jhammel@mozilla.com>
parents:
3
diff
changeset
|
135 """perform a command in the patch repository""" |
|
44ea39c3e98f
add methods for dealing with the patch repositories
Jeff Hammel <jhammel@mozilla.com>
parents:
3
diff
changeset
|
136 _oldpwd = os.getcwd() |
|
44ea39c3e98f
add methods for dealing with the patch repositories
Jeff Hammel <jhammel@mozilla.com>
parents:
3
diff
changeset
|
137 os.chdir(self._patch_repo()) |
|
44ea39c3e98f
add methods for dealing with the patch repositories
Jeff Hammel <jhammel@mozilla.com>
parents:
3
diff
changeset
|
138 call(command) |
|
44ea39c3e98f
add methods for dealing with the patch repositories
Jeff Hammel <jhammel@mozilla.com>
parents:
3
diff
changeset
|
139 os.chdir(_oldpwd) |
| 0 | 140 |
| 141 def main(args=sys.argv[1:]): | |
| 142 parser = CommandParser(HQ) | |
| 143 options, args = parser.parse_args(args) | |
| 144 parser.invoke(args) | |
| 145 | |
| 146 if __name__ == '__main__': | |
| 147 main() |