view release on metacpan or search on metacpan
src/subversion/subversion/include/svn_xml.h view on Meta::CPAN
*/
void
svn_xml_hash_atts_preserving(const char **atts,
apr_hash_t *ht,
apr_pool_t *pool);
/** Like svn_xml_make_att_hash(), but takes a hash and overwrites
* key/value pairs already in it that also appear in @a atts.
*/
void
svn_xml_hash_atts_overlaying(const char **atts,
apr_hash_t *ht,
apr_pool_t *pool);
/* Printing XML */
/** Create an XML header and return it in @a *str.
*
* Fully-formed XML documents should start out with a header,
src/subversion/subversion/include/svn_xml.h view on Meta::CPAN
* The reason is that a hash table is the most natural interface to an
* attribute list; the fact that Expat uses <tt>char **</tt> atts instead is
* certainly a defensible implementation decision, but since we'd have
* to have special code to support such lists throughout Subversion
* anyway, we might as well write that code for the natural interface
* (hashes) and then convert in the few cases where conversion is
* needed. Someday it might even be nice to change expat-lite to work
* with apr hashes.
*
* See conversion functions svn_xml_make_att_hash() and
* svn_xml_make_att_hash_overlaying(). Callers should use those to
* convert Expat attr lists into hashes when necessary.
*/
void
svn_xml_make_open_tag_hash(svn_stringbuf_t **str,
apr_pool_t *pool,
enum svn_xml_open_tag_style style,
const char *tagname,
apr_hash_t *attributes);
src/subversion/subversion/libsvn_client/merge.c view on Meta::CPAN
if (! *conflict_report || (*conflict_report)->was_last_range)
{
/* Let everyone know we're finished here. */
notify_merge_completed(target->abspath, ctx, iterpool);
}
/* Does the caller want to know what the merge has done? */
if (modified_subtrees)
{
*modified_subtrees =
apr_hash_overlay(result_pool, *modified_subtrees,
merge_cmd_baton.merged_abspaths);
*modified_subtrees =
apr_hash_overlay(result_pool, *modified_subtrees,
merge_cmd_baton.added_abspaths);
*modified_subtrees =
apr_hash_overlay(result_pool, *modified_subtrees,
merge_cmd_baton.skipped_abspaths);
*modified_subtrees =
apr_hash_overlay(result_pool, *modified_subtrees,
merge_cmd_baton.tree_conflicted_abspaths);
}
if (src_session)
SVN_ERR(svn_ra_reparent(src_session, old_src_session_url, iterpool));
svn_pool_destroy(iterpool);
return SVN_NO_ERROR;
}
src/subversion/subversion/libsvn_subr/config.c view on Meta::CPAN
}
if (! red_config)
SVN_ERR(svn_config_create2(cfgp, FALSE, FALSE, pool));
return SVN_NO_ERROR;
}
/* CONFIG_DIR provides an override for the default behavior of reading
the default set of overlay files described by read_all()'s doc
string. */
static svn_error_t *
get_category_config(svn_config_t **cfg,
const char *config_dir,
const char *category,
apr_pool_t *pool)
{
const char *usr_reg_path = NULL, *sys_reg_path = NULL;
const char *usr_cfg_path, *sys_cfg_path;
svn_error_t *err = NULL;
src/subversion/subversion/libsvn_subr/xml.c view on Meta::CPAN
apr_hash_t *
svn_xml_make_att_hash(const char **atts, apr_pool_t *pool)
{
apr_hash_t *ht = apr_hash_make(pool);
amalgamate(atts, ht, 0, pool); /* third arg irrelevant in this case */
return ht;
}
void
svn_xml_hash_atts_overlaying(const char **atts,
apr_hash_t *ht,
apr_pool_t *pool)
{
amalgamate(atts, ht, 0, pool);
}
void
svn_xml_hash_atts_preserving(const char **atts,
apr_hash_t *ht,
src/subversion/subversion/libsvn_wc/entries.c view on Meta::CPAN
add add+copied work work
add+copied add+copied work work
normal replace base base+work
add+copied replace work work+work
normal replace+copied base base+work
add+copied replace+copied work work+work
However "svn merge" make this more complicated. The pre-wcng
"svn merge" is capable of replacing a directory, that is it can
mark the whole tree deleted, and then copy another tree on top.
The entries then represent the replacing tree overlayed on the
deleted tree.
original replace schedule in
tree tree combined tree
A A replace+copied
A/f delete+copied
A/g A/g replace+copied
A/h add+copied
A/B A/B replace+copied
src/subversion/subversion/libsvn_wc/status.c view on Meta::CPAN
wb->db, local_abspath,
scratch_pool, iterpool));
/* Create a hash containing all children. The source hashes
don't all map the same types, but only the keys of the result
hash are subsequently used. */
SVN_ERR(svn_wc__db_read_children_info(&nodes, &conflicts,
wb->db, local_abspath,
scratch_pool, iterpool));
all_children = apr_hash_overlay(scratch_pool, nodes, dirents);
if (apr_hash_count(conflicts) > 0)
all_children = apr_hash_overlay(scratch_pool, conflicts, all_children);
/* Handle "this-dir" first. */
if (! skip_this_dir)
{
/* This code is not conditional on HAVE_SYMLINK as some systems that do
not allow creating symlinks (!HAVE_SYMLINK) can still encounter
symlinks (or in case of Windows also 'Junctions') created by other
methods.
Without this block a working copy in the root of a junction is
src/subversion/subversion/libsvn_wc/wc_db.c view on Meta::CPAN
apr_hash_index_t *hi;
for (hi = apr_hash_first(result_pool, db->dir_data);
hi;
hi = apr_hash_next(hi))
{
const svn_wc__db_wcroot_t *wcroot = svn__apr_hash_index_val(hi);
/* This is highly redundant, 'cause the same WCROOT will appear many
times in dir_data. */
result = apr_hash_overlay(result_pool, result, wcroot->access_cache);
}
return result;
}
svn_error_t *
svn_wc__db_temp_borrow_sdb(svn_sqlite__db_t **sdb,
svn_wc__db_t *db,
const char *local_dir_abspath,
src/subversion/subversion/po/zh_CN.po view on Meta::CPAN
# /bin/rm zh_CN_new.po
#
# Dictionary:
# BASE revision åºç¡çæ¬
# blame 追溯
# branch 忝
# checkout æ£åº
# default é»è®¤
# HEAD revision ææ°çæ¬
# Obliteration ç迹
# overlay éè½½
# peg éé
# remove å é¤
# rename æ¹å
# repository çæ¬åº
# revert æ¢å¤
# revision çæ¬
# Subversion book Subversion æå
# undo æ¤é
# unified diff æ åå·®å¼
# unversioned æªçæ¬æ§å¶
src/subversion/subversion/svn/svn.c view on Meta::CPAN
err = svn_error_create
(SVN_ERR_CL_LOG_MESSAGE_IS_PATHNAME, NULL,
_("The lock comment is a pathname "
"(was -F intended?); use '--force-log' to override"));
}
return EXIT_ERROR(err);
}
}
}
/* XXX: Only diff_cmd for now, overlay rest later and stop passing
opt_state altogether? */
if (opt_state.diff.diff_cmd)
svn_config_set(cfg_config, SVN_CONFIG_SECTION_HELPERS,
SVN_CONFIG_OPTION_DIFF_CMD, opt_state.diff.diff_cmd);
if (opt_state.merge_cmd)
svn_config_set(cfg_config, SVN_CONFIG_SECTION_HELPERS,
SVN_CONFIG_OPTION_DIFF3_CMD, opt_state.merge_cmd);
if (opt_state.diff.internal_diff)
svn_config_set(cfg_config, SVN_CONFIG_SECTION_HELPERS,
SVN_CONFIG_OPTION_DIFF_CMD, NULL);
src/subversion/subversion/tests/libsvn_wc/db-test.c view on Meta::CPAN
/* Base-deleted tree extending past deleted WORKING subtree. */
SVN_ERR(svn_wc__db_scan_deletion(
&base_del_abspath,
&moved_to_abspath,
&work_del_abspath,
NULL,
db, svn_dirent_join(local_abspath, "J/J-e/J-e-b/Jeba", pool),
pool, pool));
/* ### I don't understand this. "J/J-e/J-e-b/Jeba" is a deleted
base node that is not overlayed by the replacement rooted at "J".
Why does base_del_abspath refer to "J-e"? */
SVN_TEST_ASSERT(validate_abspath(local_abspath, "J",
base_del_abspath, pool));
SVN_TEST_ASSERT(validate_abspath(local_abspath, "other/place/J-e-b/Jeba",
moved_to_abspath, pool));
SVN_TEST_ASSERT(work_del_abspath == NULL);
/* Base-deleted tree extending past added WORKING tree. */
SVN_ERR(svn_wc__db_scan_deletion(
&base_del_abspath,
src/subversion/tools/dev/svn-entries.el view on Meta::CPAN
;; To hide:
;; M-x svn-entries-hide
;; (I tried doing this as a minor mode but setting margins during
;; alist initialization didn't work...)
;; Tested on FSF Emacs 22.
(defvar svn-entries-overlays nil "Overlays used in this buffer.")
(make-variable-buffer-local 'svn-entries-overlays)
(defgroup svn-entries nil
"Show labels to the left of .svn/entries buffers"
:group 'convenience)
(defface svn-entries
'((t :inherit shadow))
"Face for displaying line numbers in the display margin."
:group 'svn-entries)
(defun svn-entries-set-margins (buf margin)
(dolist (w (get-buffer-window-list buf nil t))
(set-window-margins w margin)))
(defun svn-entries-hide ()
"Delete all overlays displaying labels for this buffer."
(interactive)
(mapc #'delete-overlay svn-entries-overlays)
(setq svn-entries-overlays nil)
(svn-entries-set-margins (current-buffer) 0)
(remove-hook 'window-configuration-change-hook
'svn-entries-after-config t))
(defun svn-entries-show ()
"Update labels for the current buffer."
(interactive)
(svn-entries-update (current-buffer))
(add-hook 'window-configuration-change-hook
'svn-entries-after-config nil t))
src/subversion/tools/dev/svn-entries.el view on Meta::CPAN
(svn-entries-hide)
(save-excursion
(save-restriction
(widen)
(let ((last-line (line-number-at-pos (point-max)))
(field 0)
(done nil))
(goto-char (point-min))
(while (not done)
(cond ((= (point) 1)
(svn-entries-overlay-here "format"))
((= (following-char) 12) ; ^L
(setq field 0))
((not (eobp))
(svn-entries-overlay-here (elt svn-entries-labels field))
(setq field (1+ field))))
(setq done (> (forward-line) 0))))))
(svn-entries-set-margins buffer svn-entries-margin-width)))
(defun svn-entries-overlay-here (label)
(let* ((fmt-label (propertize label 'face 'svn-entries))
(left-label (propertize " " 'display `((margin left-margin)
,fmt-label)))
(ov (make-overlay (point) (point))))
(push ov svn-entries-overlays)
(overlay-put ov 'before-string left-label)))
(defun svn-entries-after-config ()
(walk-windows (lambda (w) (svn-entries-set-margins-if-overlaid (window-buffer)))
nil 'visible))
(defun svn-entries-set-margins-if-overlaid (b)
(with-current-buffer b
(when svn-entries-overlays
(svn-entries-set-margins b svn-entries-margin-width))))
(provide 'svn-entries)
;;; svn-entries.el ends here
src/subversion/tools/server-side/svnpubsub/irkerbridge.py view on Meta::CPAN
signal.signal(signal.SIGHUP, self.hangup)
def hangup(self, signalnum, frame):
self.reload()
def reload(self):
print "RELOAD: config file: %s" % self.fname
sys.stdout.flush()
# Delete everything. Just re-reading would overlay, and would not
# remove sections/options. Note that [DEFAULT] will not be removed.
for section in self.sections():
self.remove_section(section)
# Get rid of [DEFAULT]
self.remove_section(ConfigParser.DEFAULTSECT)
# Now re-read the configuration file.
self.read(self.fname)
src/subversion/tools/server-side/svnpubsub/svnwcsub.py view on Meta::CPAN
self.fname = fname
self.read(fname)
### install a signal handler to set SHOULD_RELOAD. BDEC should
### poll this flag, and then adjust its internal structures after
### the reload.
self.should_reload = False
def reload(self):
# Delete everything. Just re-reading would overlay, and would not
# remove sections/options. Note that [DEFAULT] will not be removed.
for section in self.sections():
self.remove_section(section)
# Now re-read the configuration file.
self.read(fname)
def get_value(self, which):
return self.get(ConfigParser.DEFAULTSECT, which)