Kiln » Kiln Extensions
Clone URL:  
Pushed to 2 repositories · View In Graph Contained in tip

Update Kiln Extension to 2.5.104

Changeset 10e6ab531de6…

Parent b4944cd04b48…

by Profile picture of User 12Benjamin Pollack <benjamin@fogcreek.com>

Changes to 3 files · Browse files at 10e6ab531de6 Showing diff from parent b4944cd04b48 Diff from another changeset...

Change 1 of 2 Show Entire File bfiles/​kbfiles/​bfsetup.py Stacked
 
265
266
267
268
269
 
 
270
271
272
 
834
835
836
 
 
 
 
 
 
 
 
 
837
838
839
 
265
266
267
 
 
268
269
270
271
272
 
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
@@ -265,8 +265,8 @@
  continue     # Append directory separator to avoid collisions - if not fstandin.endswith('/'): - fstandin += '/' + if not fstandin.endswith(os.sep): + fstandin += os.sep     # Prevalidate matching standin directories   if any(st for st in match._files if st.startswith(fstandin)): @@ -834,6 +834,15 @@
    getdata = getdatafn   write(f, 'x' in ff and 0755 or 0644, 'l' in ff, getdata) + + if subrepos: + for subpath in ctx.substate: + sub = ctx.sub(subpath) + try: + sub.archive(repo.ui, archiver, prefix) + except TypeError: + sub.archive(archiver, prefix) +   archiver.done()    # If a bfile is modified the change is not reflected in its standin until a commit.
Change 1 of 1 Show Entire File kiln.py Stacked
 
107
108
109
110
 
111
112
113
114
115
 
 
116
117
118
 
107
108
109
 
110
111
112
113
 
 
114
115
116
117
118
@@ -107,12 +107,12 @@
  r'^(((com[1-9]|lpt[1-9]|con|prn|aux)(\..*)?)|web\.config' +   r'|clock\$|app_data|app_code|app_browsers' +   r'|app_globalresources|app_localresources|app_themes' + - r'|app_webreferences|bin)$', re.IGNORECASE) + r'|app_webreferences|bin|.*\.(cs|vb)html?)$', re.IGNORECASE)   p = path.split('?')   path = p[0]   query = '?' + p[1] if len(p) > 1 else '' - return '/'.join('$' + part - if reserved.match(part) or part.startswith('$') + return '/'.join('$' + part + '$' + if reserved.match(part) or part.startswith('$') or part.endswith('$')   else part   for part in path.split('/')) + query  
Change 1 of 1 Show Entire File nobranch.py Stacked
 
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
@@ -1,55 +0,0 @@
-# Copyright (C) 2009-2010 Fog Creek Software. All rights reserved. -# -# This is a small extension for Mercurial (http://www.selenic.com/mercurial) -# that discourages you from using the ``hg branch'' command. -# -# To enable the "nobranch" extension put these lines in your ~/.hgrc: -# [extensions] -# nobranch = /path/to/nobranch.py -# -# For help on the usage of "hg nobranch" use: -# hg help nobranch -# -# 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 -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -'''discourages using the branch command - -This extension discourages users from using hg branch by asking them -to confirm that doing so is truly what they want to do. -''' - -from mercurial import commands, extensions -from mercurial.i18n import _ - -warning = _(""" - Fog Creek recommends using Kiln branches instead of the - named branch you are about to create. Read more at - http://kiln.stackexchange.com/questions/127 . - - If you'd like to create a named branch anyway, use the - --override option. - -""") - -def uisetup(ui): - def reallybranch(orig, ui, repo, label=None, override=False, **opts): - if not override and label: - ui.warn(warning) - else: - return orig(ui, repo, label=label, **opts) - - entry = extensions.wrapcommand(commands.table, 'branch', reallybranch) - entry[1].append(('', 'override', False, - _('allow the creation of a named branch')))