We are currently indexing your data, so search results may be incomplete until we finish.
Kiln 2.8.30 extensions (bug fixes)
Changeset 105bd3eb46a4…
Parent 0b1d58ee5c34…
by
Kevin Gessner <kevin@fogcreek.com>
Changes to 4 files · Browse files at 105bd3eb46a4 Showing diff from parent 0b1d58ee5c34 Diff from another changeset...
|
@@ -1,4 +1,4 @@ - # Copyright (C) 2009-2011 Fog Creek Software. All rights reserved.
+# Copyright (C) 2009-2012 Fog Creek Software. All rights reserved.
#
# To enable the "gestalt" extension put these lines in your ~/.hgrc:
# [extensions]
@@ -9,7 +9,7 @@#
# This program 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
+# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
@@ -85,16 +85,16 @@ 1.5 redefined parseurl()'s return values, and 1.6 split up the
branches parameter into a two-tuple.
'''
- url, branches = hg.parseurl(source, None)[:2]
+ uri, branches = hg.parseurl(source, None)[:2]
if _HG_VERSION >= (1, 6, 0):
# branches will be None because we passed None into
- # parseurl(), so we can ignore that safely.
+ # parseuri(), so we can ignore that safely.
hashbranch, branches = branches
else:
# branches will contain one element or fewer because we passed
- # None into parseurl().
+ # None into parseuri().
hashbranch = branches and branches[0] or None
- return url, hashbranch
+ return uri, hashbranch
def addbranchrevs(lrepo, repo, hashbranch):
'''wrap hg.addbranchrevs to work on 1.5 and 1.6 and returns the
@@ -176,7 +176,6 @@'''))
return True
- target = ui.config('paths', 'default-push') and ui.expandpath('default-push') or source
source, hashbranch = parseurl(source)
other = hg.repository(remoteui(repo, opts), source)
revs = addbranchrevs(repo, other, hashbranch)
|
||
|
|
@@ -40,6 +40,7 @@ pushing to Kiln. See :hg:`help push` and
http://kiln.stackexchange.com/questions/4679/ for more information.
'''
+import itertools
import os
import re
import unicodedata
@@ -573,7 +574,7 @@ return call_api(repo.ui, baseurl, 'Api/1.0/Repo/Create', params, post=True)
except APIError, e:
if 'RepoNameAlreadyUsed' in e.errors:
- repo.ui.write_err(_('error: a repo with this name already exists: %s\n') % name)
+ repo.ui.warn(_('error: kiln: a repo with this name already exists: %s\n') % name)
return
raise
@@ -612,13 +613,19 @@ reviewers.append(name_to_ix[reviewer])
print_list(ui, [ix_to_name[r] for r in reviewers], 'reviewers:')
-def review(ui, repo, pats, opts):
+def review(ui, repo, dest, opts):
'''Associates the pushed changesets with a new or existing Kiln review.'''
if not opts['review'] or not repo.ui.config('kiln', 'node'):
return
- url = repo.ui.expandpath(pats[0] if pats else 'default-push', default='default')
+ url = repo.ui.expandpath(dest if dest else 'default-push')
+ if url == 'default-push':
+ raise util.Abort(_('kiln: please specify a default-push path before using --review'))
+
baseurl = get_api_url(url)
+ if baseurl == url:
+ ui.write_err(_('kiln: warning: this does not appear to be a Kiln URL: %s\n') % baseurl)
+
token = get_token(ui, baseurl)
kiln_repo = get_repo_record(repo, url, token)
@@ -731,6 +738,32 @@ '''
return opts['path'] != dest and dest or None
+def _standin_expand(paths):
+ '''given a sequence of filenames, returns a set of filenames --
+ relative to the current working directory! -- prefixed with all
+ possible standin prefixes e.g. .hglf or .kbf in addition to the
+ originals'''
+ paths = [os.path.relpath(os.path.abspath(p), os.getcwd()) for p in paths]
+ choices = [[p, os.path.join('.kbf', p), os.path.join('.hglf', p)] for p in paths]
+ return set(itertools.chain(*choices))
+
+def _filename_match(repo, ctx, paths):
+ '''returns a set of filenames contained in both paths and the
+ ctx's manifest, accounting for standins'''
+ try:
+ match = scmutil.match(ctx, paths)
+ match.bad = lambda *a: None
+ paths = set(ctx.walk(match))
+ return paths
+ except ImportError:
+ # Make every path normalized and relative to the current
+ # working directory, similar to scmutil.
+ needles = set(map(os.path.normpath, paths))
+ haystacks = [os.path.relpath(os.path.join(repo.root, p), os.getcwd())
+ for p in ctx.manifest().iterkeys()]
+ haystacks = set(map(os.path.normpath, haystacks))
+ return needles.intersection(haystacks)
+
def kiln(ui, repo, **opts):
'''show the relevant page of the repository in Kiln
@@ -760,14 +793,20 @@ default = True
def files(key):
- allpaths = []
- for f in opts[key]:
- paths = [path for path in repo['.'].manifest().iterkeys() if re.search(match._globre(f) + '$', path)]
- paths = [re.sub(r'^\.kbf', '', path) for path in paths]
- if not paths:
- ui.warn(_('cannot find %s') % f)
- allpaths += paths
- return allpaths
+ paths = _filename_match(repo, repo['.'], _standin_expand(opts[key]))
+ if not paths:
+ ui.warn(_('error: kiln: cannot find any paths matching %s\n') % ', '.join(opts[key]))
+ if len(paths) > 5:
+ # If we're passed a directory, we should technically open
+ # a tab for each file in that directory because that's how
+ # other hg commands e.g. cat work. However, since that's
+ # quite annoying to do by accident when opening browsers,
+ # let's prompt. (This is only relevant when scmutil
+ # exists.)
+ char = ui.prompt(_('about to open %d browser tabs or windows, abort? [Yn]') % len(paths)).lower()
+ if char != 'n':
+ raise SystemExit(0)
+ return paths
if opts['rev']:
default = False
|
|
|
@@ -90,10 +90,8 @@ if before != after:
try:
os.rename(self.__temporary_path, self.__original_path)
- except WindowsError:
+ except (IOError, OSError, WindowsError):
shutil.copyfile(self.__temporary_path, self.__original_path)
- except (IOError, OSError):
- pass
def get_cookiejar(ui):
global current_user
@@ -117,13 +115,18 @@ try:
cj = CookieJar(cookie_path)
if not os.path.exists(cookie_path):
- cj.save()
+ try:
+ cj.save()
+ except Exception, e:
+ ui.warn(_('unable to save cookies: %s') % str(e))
+ # save() destroys the tempfile; get a new one
+ cj = CookieJar(cookie_path)
if os.name == 'posix':
os.chmod(cookie_path, stat.S_IREAD | stat.S_IWRITE)
cj.load(ignore_discard=True, ignore_expires=True)
return cj
- except IOError:
- ui.warn(_('Cookie file %s exists, but could not be opened.\nContinuing without cookie authentication.\n') % cookie_path)
+ except IOError, e:
+ ui.warn(_('Cookie file %s exists, but could not be opened (%s).\nContinuing without cookie authentication.\n') % (cookie_path, e))
return MozillaCookieJar(tempfile.NamedTemporaryFile().name)
def make_cookie(request, name, value):
@@ -193,7 +196,10 @@ cj.add_cookie_header(request)
response = func(*args, **kwargs)
cj.extract_cookies(response, args[0])
- cj.save(ignore_discard=True, ignore_expires=True)
+ try:
+ cj.save(ignore_discard=True, ignore_expires=True)
+ except Exception, e:
+ ui.warn(_('unable to save cookies: %s') % str(e))
else:
response = func(*args, **kwargs)
return response
|
||
|
@@ -2,50 +2,41 @@ import os
import zipfile
-folders = ['bfiles', '_custom']
-extensions = ['.py']
-excludes = ['setup.py']
-
def compile_extensions():
compileall.compile_dir(os.path.dirname(__file__), force=1)
-def check_item(item):
- for exclude in excludes:
- if item[1].endswith(exclude):
- return False
- if item[1] in folders:
- return True
- for extension in extensions:
- if item[1].endswith(extension):
- return True
- return False
+def walk(dir_root):
+ for dirpath, dirnames, filenames in os.walk(dir_root):
+ dirnames_set = set(dirnames)
+ if 'tests' in dirnames_set:
+ dirnames.remove('tests')
-def list_files(dir_root, zip_root):
- subdirs = []
- items = []
- for item in os.listdir(dir_root):
- path = os.path.join(dir_root, item)
- zip_path = os.path.join(zip_root, item)
- if os.path.isfile(path):
- items.append([path, zip_path])
- else:
- subdirs.append([path, zip_path])
- for subdir in subdirs:
- items.extend(list_files(subdir[0], subdir[1]))
- return [f for f in items if check_item(f)]
+ for filename in filenames:
+ ignore, ext = os.path.splitext(filename)
+ if filename == 'setup.py':
+ continue
+ if ext not in ('.py', '.pyc'):
+ continue
+ yield os.path.join(dirpath, filename)
def build_release():
- compile_extensions()
- dir = os.path.dirname(__file__)
- absdir = os.path.abspath(dir)
- files = list_files(absdir, '.')
+ absdir = os.path.abspath(os.path.dirname(__file__))
+ target = os.path.join(absdir, 'kiln_extensions.zip')
print 'Creating ZIP archive...'
- zip = zipfile.ZipFile(os.path.join(absdir, 'kiln_extensions.zip'), 'w')
- for file in files:
- zip.write(file[0], file[1])
- zip.close()
+ f = None
+ try:
+ f = zipfile.ZipFile(target, 'w')
+ for filename in walk(absdir):
+ zip_filename = os.path.join(
+ 'kiln_extensions',
+ os.path.relpath(filename, absdir))
+ print ' %s' % zip_filename
+ f.write(filename, zip_filename)
+ finally:
+ if f: f.close()
print 'Success!'
if __name__ == '__main__':
+ compile_extensions()
build_release()
|
||
Add a tag
Loading...