Mercurial > hg > hq

annotate hq/main.py @ 5:448c248b3738

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
start the path to using the __init__ function for realz
author Jeff Hammel <jhammel@mozilla.com>
date Wed, 26 May 2010 08:18:36 -0700
parents 44ea39c3e98f
children 321721b581f1
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
b5671297a0db initial commit of hq
Jeff Hammel <jhammel@mozilla.com>
parents:
diff changeset
1 #!/usr/bin/env python
b5671297a0db initial commit of hq
Jeff Hammel <jhammel@mozilla.com>
parents:
diff changeset
2 """
b5671297a0db initial commit of hq
Jeff Hammel <jhammel@mozilla.com>
parents:
diff changeset
3 mercurial queue extension front-end policy manager
b5671297a0db initial commit of hq
Jeff Hammel <jhammel@mozilla.com>
parents:
diff changeset
4 """
b5671297a0db initial commit of hq
Jeff Hammel <jhammel@mozilla.com>
parents:
diff changeset
5
b5671297a0db initial commit of hq
Jeff Hammel <jhammel@mozilla.com>
parents:
diff changeset
6 import os
b5671297a0db initial commit of hq
Jeff Hammel <jhammel@mozilla.com>
parents:
diff changeset
7 import subprocess
b5671297a0db initial commit of hq
Jeff Hammel <jhammel@mozilla.com>
parents:
diff changeset
8 import sys
b5671297a0db initial commit of hq
Jeff Hammel <jhammel@mozilla.com>
parents:
diff changeset
9
b5671297a0db initial commit of hq
Jeff Hammel <jhammel@mozilla.com>
parents:
diff changeset
10 from command import CommandParser
b5671297a0db initial commit of hq
Jeff Hammel <jhammel@mozilla.com>
parents:
diff changeset
11
b5671297a0db initial commit of hq
Jeff Hammel <jhammel@mozilla.com>
parents:
diff changeset
12 def call(command, *args, **kw):
b5671297a0db initial commit of hq
Jeff Hammel <jhammel@mozilla.com>
parents:
diff changeset
13 code = subprocess.call(command, *args, **kw)
b5671297a0db initial commit of hq
Jeff Hammel <jhammel@mozilla.com>
parents:
diff changeset
14 if code:
b5671297a0db initial commit of hq
Jeff Hammel <jhammel@mozilla.com>
parents:
diff changeset
15 if isinstance(command, basestring):
b5671297a0db initial commit of hq
Jeff Hammel <jhammel@mozilla.com>
parents:
diff changeset
16 cmdstr = command
b5671297a0db initial commit of hq
Jeff Hammel <jhammel@mozilla.com>
parents:
diff changeset
17 else:
b5671297a0db initial commit of hq
Jeff Hammel <jhammel@mozilla.com>
parents:
diff changeset
18 cmdstr = ' '.join(command)
b5671297a0db initial commit of hq
Jeff Hammel <jhammel@mozilla.com>
parents:
diff changeset
19 raise SystemExit("Command `%s` exited with code %d" % (cmdstr, code))
b5671297a0db initial commit of hq
Jeff Hammel <jhammel@mozilla.com>
parents:
diff changeset
20
b5671297a0db initial commit of hq
Jeff Hammel <jhammel@mozilla.com>
parents:
diff changeset
21 class HQ(object):
b5671297a0db initial commit of hq
Jeff Hammel <jhammel@mozilla.com>
parents:
diff changeset
22 """
b5671297a0db initial commit of hq
Jeff Hammel <jhammel@mozilla.com>
parents:
diff changeset
23 mercurial queue extension front-end policy manager
b5671297a0db initial commit of hq
Jeff Hammel <jhammel@mozilla.com>
parents:
diff changeset
24 """
b5671297a0db initial commit of hq
Jeff Hammel <jhammel@mozilla.com>
parents:
diff changeset
25
5
448c248b3738 start the path to using the __init__ function for realz
Jeff Hammel <jhammel@mozilla.com>
parents: 4
diff changeset
26 def __init__(self, queue_host=None, network=True)
0
b5671297a0db initial commit of hq
Jeff Hammel <jhammel@mozilla.com>
parents:
diff changeset
27 """initialize global options"""
b5671297a0db initial commit of hq
Jeff Hammel <jhammel@mozilla.com>
parents:
diff changeset
28 # TODO: look at hgrc file
1
67e06ca7c56e documentation notes
Jeff Hammel <jhammel@mozilla.com>
parents: 0
diff changeset
29 # 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
30 # XXX ???
448c248b3738 start the path to using the __init__ function for realz
Jeff Hammel <jhammel@mozilla.com>
parents: 4
diff changeset
31
448c248b3738 start the path to using the __init__ function for realz
Jeff Hammel <jhammel@mozilla.com>
parents: 4
diff changeset
32 # check for network
448c248b3738 start the path to using the __init__ function for realz
Jeff Hammel <jhammel@mozilla.com>
parents: 4
diff changeset
33 self.network = network
448c248b3738 start the path to using the __init__ function for realz
Jeff Hammel <jhammel@mozilla.com>
parents: 4
diff changeset
34
448c248b3738 start the path to using the __init__ function for realz
Jeff Hammel <jhammel@mozilla.com>
parents: 4
diff changeset
35 self.queue_host = queue_host
0
b5671297a0db initial commit of hq
Jeff Hammel <jhammel@mozilla.com>
parents:
diff changeset
36
3
8bc27dbf0214 add stub for goto
Jeff Hammel <jhammel@mozilla.com>
parents: 2
diff changeset
37 def clone(self, repo, patch=None, queue=None):
8bc27dbf0214 add stub for goto
Jeff Hammel <jhammel@mozilla.com>
parents: 2
diff changeset
38 """
8bc27dbf0214 add stub for goto
Jeff Hammel <jhammel@mozilla.com>
parents: 2
diff changeset
39 clone the repository and begin a patch queue
8bc27dbf0214 add stub for goto
Jeff Hammel <jhammel@mozilla.com>
parents: 2
diff changeset
40 - path: name of a new patch to initiate
8bc27dbf0214 add stub for goto
Jeff Hammel <jhammel@mozilla.com>
parents: 2
diff changeset
41 - queue: name of the remote queue
8bc27dbf0214 add stub for goto
Jeff Hammel <jhammel@mozilla.com>
parents: 2
diff changeset
42 """
0
b5671297a0db initial commit of hq
Jeff Hammel <jhammel@mozilla.com>
parents:
diff changeset
43 directory = repo.rsplit('/', 1)
b5671297a0db initial commit of hq
Jeff Hammel <jhammel@mozilla.com>
parents:
diff changeset
44 call(['hg', 'clone', repo, directory])
b5671297a0db initial commit of hq
Jeff Hammel <jhammel@mozilla.com>
parents:
diff changeset
45 os.chdir(directory)
b5671297a0db initial commit of hq
Jeff Hammel <jhammel@mozilla.com>
parents:
diff changeset
46 call(['hg', 'qinit', '-c'])
3
8bc27dbf0214 add stub for goto
Jeff Hammel <jhammel@mozilla.com>
parents: 2
diff changeset
47 if queue:
4
44ea39c3e98f add methods for dealing with the patch repositories
Jeff Hammel <jhammel@mozilla.com>
parents: 3
diff changeset
48 # pull from the given repository
44ea39c3e98f add methods for dealing with the patch repositories
Jeff Hammel <jhammel@mozilla.com>
parents: 3
diff changeset
49 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
50 else:
44ea39c3e98f add methods for dealing with the patch repositories
Jeff Hammel <jhammel@mozilla.com>
parents: 3
diff changeset
51 # (optionally) setup a new repo
44ea39c3e98f add methods for dealing with the patch repositories
Jeff Hammel <jhammel@mozilla.com>
parents: 3
diff changeset
52 pass # TODO
44ea39c3e98f add methods for dealing with the patch repositories
Jeff Hammel <jhammel@mozilla.com>
parents: 3
diff changeset
53
0
b5671297a0db initial commit of hq
Jeff Hammel <jhammel@mozilla.com>
parents:
diff changeset
54 if patch:
4
44ea39c3e98f add methods for dealing with the patch repositories
Jeff Hammel <jhammel@mozilla.com>
parents: 3
diff changeset
55 # create a new patch
0
b5671297a0db initial commit of hq
Jeff Hammel <jhammel@mozilla.com>
parents:
diff changeset
56 call(['hg', 'qnew', patch])
b5671297a0db initial commit of hq
Jeff Hammel <jhammel@mozilla.com>
parents:
diff changeset
57
b5671297a0db initial commit of hq
Jeff Hammel <jhammel@mozilla.com>
parents:
diff changeset
58 def edit(self, patch=None):
b5671297a0db initial commit of hq
Jeff Hammel <jhammel@mozilla.com>
parents:
diff changeset
59 """
b5671297a0db initial commit of hq
Jeff Hammel <jhammel@mozilla.com>
parents:
diff changeset
60 edit a patch
b5671297a0db initial commit of hq
Jeff Hammel <jhammel@mozilla.com>
parents:
diff changeset
61 - patch: the patch to edit
b5671297a0db initial commit of hq
Jeff Hammel <jhammel@mozilla.com>
parents:
diff changeset
62 """
b5671297a0db initial commit of hq
Jeff Hammel <jhammel@mozilla.com>
parents:
diff changeset
63
b5671297a0db initial commit of hq
Jeff Hammel <jhammel@mozilla.com>
parents:
diff changeset
64 def commit(self, message):
b5671297a0db initial commit of hq
Jeff Hammel <jhammel@mozilla.com>
parents:
diff changeset
65 """
b5671297a0db initial commit of hq
Jeff Hammel <jhammel@mozilla.com>
parents:
diff changeset
66 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
67 - message : commit message
0
b5671297a0db initial commit of hq
Jeff Hammel <jhammel@mozilla.com>
parents:
diff changeset
68 """
b5671297a0db initial commit of hq
Jeff Hammel <jhammel@mozilla.com>
parents:
diff changeset
69 call(['hg', 'qrefresh'])
b5671297a0db initial commit of hq
Jeff Hammel <jhammel@mozilla.com>
parents:
diff changeset
70 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
71 if self.network:
448c248b3738 start the path to using the __init__ function for realz
Jeff Hammel <jhammel@mozilla.com>
parents: 4
diff changeset
72 self._patch_command(*['hg', 'push'])
0
b5671297a0db initial commit of hq
Jeff Hammel <jhammel@mozilla.com>
parents:
diff changeset
73
b5671297a0db initial commit of hq
Jeff Hammel <jhammel@mozilla.com>
parents:
diff changeset
74 def pull(self, repo=None):
b5671297a0db initial commit of hq
Jeff Hammel <jhammel@mozilla.com>
parents:
diff changeset
75 """
b5671297a0db initial commit of hq
Jeff Hammel <jhammel@mozilla.com>
parents:
diff changeset
76 pull from the root repository
b5671297a0db initial commit of hq
Jeff Hammel <jhammel@mozilla.com>
parents:
diff changeset
77 """
b5671297a0db initial commit of hq
Jeff Hammel <jhammel@mozilla.com>
parents:
diff changeset
78 # TODO: commit prior to realignment
b5671297a0db initial commit of hq
Jeff Hammel <jhammel@mozilla.com>
parents:
diff changeset
79 call(['hg', 'qpop', '--all'])
b5671297a0db initial commit of hq
Jeff Hammel <jhammel@mozilla.com>
parents:
diff changeset
80 call(['hg', 'pull'] + repo and [repo] or [])
b5671297a0db initial commit of hq
Jeff Hammel <jhammel@mozilla.com>
parents:
diff changeset
81 call(['hg', 'qpush', '--all'])
2
dedf4c4c2ba2 add a function to list files (incomplete)
Jeff Hammel <jhammel@mozilla.com>
parents: 1
diff changeset
82
3
8bc27dbf0214 add stub for goto
Jeff Hammel <jhammel@mozilla.com>
parents: 2
diff changeset
83 def goto(self, patch):
8bc27dbf0214 add stub for goto
Jeff Hammel <jhammel@mozilla.com>
parents: 2
diff changeset
84 """
5
448c248b3738 start the path to using the __init__ function for realz
Jeff Hammel <jhammel@mozilla.com>
parents: 4
diff changeset
85 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
86 - patch: name of patch to go to
3
8bc27dbf0214 add stub for goto
Jeff Hammel <jhammel@mozilla.com>
parents: 2
diff changeset
87 """
8bc27dbf0214 add stub for goto
Jeff Hammel <jhammel@mozilla.com>
parents: 2
diff changeset
88 # TODO
8bc27dbf0214 add stub for goto
Jeff Hammel <jhammel@mozilla.com>
parents: 2
diff changeset
89 process = subprocess.Popen(['hg', 'qapplied'], stdout=subprocess.PIPE)
8bc27dbf0214 add stub for goto
Jeff Hammel <jhammel@mozilla.com>
parents: 2
diff changeset
90 stdout, stderr = process.communicate()
8bc27dbf0214 add stub for goto
Jeff Hammel <jhammel@mozilla.com>
parents: 2
diff changeset
91 applied = [ i.strip() for i in stdout.splitlines()
8bc27dbf0214 add stub for goto
Jeff Hammel <jhammel@mozilla.com>
parents: 2
diff changeset
92 if i ]
8bc27dbf0214 add stub for goto
Jeff Hammel <jhammel@mozilla.com>
parents: 2
diff changeset
93 raise NotImplementedError
8bc27dbf0214 add stub for goto
Jeff Hammel <jhammel@mozilla.com>
parents: 2
diff changeset
94
2
dedf4c4c2ba2 add a function to list files (incomplete)
Jeff Hammel <jhammel@mozilla.com>
parents: 1
diff changeset
95 def files(self):
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 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
98 """
dedf4c4c2ba2 add a function to list files (incomplete)
Jeff Hammel <jhammel@mozilla.com>
parents: 1
diff changeset
99 # 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
100 _oldcwd = os.getcwd()
dedf4c4c2ba2 add a function to list files (incomplete)
Jeff Hammel <jhammel@mozilla.com>
parents: 1
diff changeset
101 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
102 stdout, stderr = process.communicate()
dedf4c4c2ba2 add a function to list files (incomplete)
Jeff Hammel <jhammel@mozilla.com>
parents: 1
diff changeset
103 return stdout
dedf4c4c2ba2 add a function to list files (incomplete)
Jeff Hammel <jhammel@mozilla.com>
parents: 1
diff changeset
104
4
44ea39c3e98f add methods for dealing with the patch repositories
Jeff Hammel <jhammel@mozilla.com>
parents: 3
diff changeset
105 def _patch_repo(self):
44ea39c3e98f add methods for dealing with the patch repositories
Jeff Hammel <jhammel@mozilla.com>
parents: 3
diff changeset
106 """the location of the patch repository"""
44ea39c3e98f add methods for dealing with the patch repositories
Jeff Hammel <jhammel@mozilla.com>
parents: 3
diff changeset
107 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
108 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
109
44ea39c3e98f add methods for dealing with the patch repositories
Jeff Hammel <jhammel@mozilla.com>
parents: 3
diff changeset
110 def _patch_command(self, *command):
44ea39c3e98f add methods for dealing with the patch repositories
Jeff Hammel <jhammel@mozilla.com>
parents: 3
diff changeset
111 """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
112 _oldpwd = os.getcwd()
44ea39c3e98f add methods for dealing with the patch repositories
Jeff Hammel <jhammel@mozilla.com>
parents: 3
diff changeset
113 os.chdir(self._patch_repo())
44ea39c3e98f add methods for dealing with the patch repositories
Jeff Hammel <jhammel@mozilla.com>
parents: 3
diff changeset
114 call(command)
44ea39c3e98f add methods for dealing with the patch repositories
Jeff Hammel <jhammel@mozilla.com>
parents: 3
diff changeset
115 os.chdir(_oldpwd)
0
b5671297a0db initial commit of hq
Jeff Hammel <jhammel@mozilla.com>
parents:
diff changeset
116
b5671297a0db initial commit of hq
Jeff Hammel <jhammel@mozilla.com>
parents:
diff changeset
117 def main(args=sys.argv[1:]):
b5671297a0db initial commit of hq
Jeff Hammel <jhammel@mozilla.com>
parents:
diff changeset
118 parser = CommandParser(HQ)
b5671297a0db initial commit of hq
Jeff Hammel <jhammel@mozilla.com>
parents:
diff changeset
119 options, args = parser.parse_args(args)
b5671297a0db initial commit of hq
Jeff Hammel <jhammel@mozilla.com>
parents:
diff changeset
120 parser.invoke(args)
b5671297a0db initial commit of hq
Jeff Hammel <jhammel@mozilla.com>
parents:
diff changeset
121
b5671297a0db initial commit of hq
Jeff Hammel <jhammel@mozilla.com>
parents:
diff changeset
122 if __name__ == '__main__':
b5671297a0db initial commit of hq
Jeff Hammel <jhammel@mozilla.com>
parents:
diff changeset
123 main()